From d0ec9ffa8fa802e984a116c970dbabf1ec1b029f Mon Sep 17 00:00:00 2001 From: kemuru <102478601+kemuru@users.noreply.github.com> Date: Mon, 17 Feb 2025 23:23:22 +0100 Subject: [PATCH 01/10] fix: toastify fix --- web/src/styles/global-style.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/src/styles/global-style.ts b/web/src/styles/global-style.ts index 1b548df2..8979c6bf 100644 --- a/web/src/styles/global-style.ts +++ b/web/src/styles/global-style.ts @@ -121,4 +121,9 @@ export const GlobalStyle = createGlobalStyle` .hiddenCanvasElement{ display: none; } + + [class*="Toastify__toast-container"] { + top: unset; + padding-top: 20px !important; + } `; From 1197bc22f0b1eb35ede1a5847de0569a915b5482 Mon Sep 17 00:00:00 2001 From: Harman-singh-waraich Date: Mon, 3 Mar 2025 22:19:55 +0530 Subject: [PATCH 02/10] chore(web): update-subgraph-status-lib --- web/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/package.json b/web/package.json index bcb8dea8..78bc5cef 100644 --- a/web/package.json +++ b/web/package.json @@ -98,7 +98,7 @@ "react-toastify": "^9.1.3", "react-use": "^17.4.3", "styled-components": "^5.3.11", - "subgraph-status": "^1.2.3", + "subgraph-status": "^1.2.4", "viem": "^2.22.22", "wagmi": "^2.14.10" } diff --git a/yarn.lock b/yarn.lock index a81fe1cb..36727742 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4709,7 +4709,7 @@ __metadata: react-toastify: "npm:^9.1.3" react-use: "npm:^17.4.3" styled-components: "npm:^5.3.11" - subgraph-status: "npm:^1.2.3" + subgraph-status: "npm:^1.2.4" typescript: "npm:^5.7.3" viem: "npm:^2.22.22" vite: "npm:^5.4.2" @@ -27324,9 +27324,9 @@ __metadata: languageName: node linkType: hard -"subgraph-status@npm:^1.2.3": - version: 1.2.3 - resolution: "subgraph-status@npm:1.2.3" +"subgraph-status@npm:^1.2.4": + version: 1.2.4 + resolution: "subgraph-status@npm:1.2.4" dependencies: react-slick: "npm:^0.30.2" slick-carousel: "npm:^1.8.1" @@ -27336,7 +27336,7 @@ __metadata: "@types/react-dom": ^18.3.0 react: ^18.3.1 react-dom: ^18.3.1 - checksum: 10/a125ec618073493026a29e9120a1fc73f8a3ad36b24815fe2f4ecd65f8cefa8b19d5bc072ee3f9b72172436c783fc918f6f13b396dddb935c5e70a3bd748888d + checksum: 10/8088ec7440f5d2811fae8b6520f531c60f41a786384a874005646240d22570601a359e5681912ae125aa81e1208f9e2e7c359ca1c81ab92363bbf27688b880bb languageName: node linkType: hard From 7c391f036d3ebec2aff3a1791927d32a13ee2b8d Mon Sep 17 00:00:00 2001 From: kemuru <102478601+kemuru@users.noreply.github.com> Date: Thu, 17 Apr 2025 02:18:52 +0200 Subject: [PATCH 03/10] fix: pull updated kleroscore address by deployment and update arbitration cost --- contracts/package.json | 2 +- web/package.json | 2 +- web/src/consts/arbitration.ts | 11 + .../useArbitrationCostFromKlerosCore.ts | 2 +- yarn.lock | 907 +++++++++++++++++- 5 files changed, 883 insertions(+), 41 deletions(-) create mode 100644 web/src/consts/arbitration.ts diff --git a/contracts/package.json b/contracts/package.json index fe111f11..325c6019 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -83,7 +83,7 @@ "typescript": "^5.7.3" }, "dependencies": { - "@kleros/kleros-v2-contracts": "^0.7.0", + "@kleros/kleros-v2-contracts": "^0.8.1", "@openzeppelin/contracts": "^5.2.0" } } diff --git a/web/package.json b/web/package.json index 78bc5cef..84dc126c 100644 --- a/web/package.json +++ b/web/package.json @@ -66,7 +66,7 @@ }, "dependencies": { "@cyntler/react-doc-viewer": "^1.16.3", - "@kleros/kleros-app": "^2.0.2", + "@kleros/kleros-app": "^2.1.0", "@kleros/ui-components-library": "^2.19.0", "@reown/appkit": "^1.6.6", "@reown/appkit-adapter-wagmi": "^1.6.6", diff --git a/web/src/consts/arbitration.ts b/web/src/consts/arbitration.ts new file mode 100644 index 00000000..a31937af --- /dev/null +++ b/web/src/consts/arbitration.ts @@ -0,0 +1,11 @@ +import { DEFAULT_CHAIN } from "./chains"; + +import arbitrumSepoliaDevnet from "@kleros/kleros-v2-contracts/deployments/arbitrumSepoliaDevnet"; +import arbitrum from "@kleros/kleros-v2-contracts/deployments/arbitrum"; + +const deploymentsByChainId: Record = { + 421614: arbitrumSepoliaDevnet, + 42161: arbitrum, +}; + +export const KLEROS_CORE_ADDRESS = deploymentsByChainId[DEFAULT_CHAIN].contracts.KlerosCore.address; diff --git a/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts b/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts index 7c643700..37cbc850 100644 --- a/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts +++ b/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts @@ -1,7 +1,7 @@ import { useReadContract } from "wagmi"; import { parseAbi } from "viem"; +import { KLEROS_CORE_ADDRESS } from "consts/arbitration"; -const KLEROS_CORE_ADDRESS = "0xA54e7A16d7460e38a8F324eF46782FB520d58CE8"; const KLEROS_CORE_ABI = parseAbi([ "function arbitrationCost(bytes _extraData) view returns (uint256 cost)", ]); diff --git a/yarn.lock b/yarn.lock index 36727742..13054cd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -63,6 +63,46 @@ __metadata: languageName: node linkType: hard +"@arbitrum/nitro-contracts@npm:1.1.1": + version: 1.1.1 + resolution: "@arbitrum/nitro-contracts@npm:1.1.1" + dependencies: + "@offchainlabs/upgrade-executor": "npm:1.1.0-beta.0" + "@openzeppelin/contracts": "npm:4.5.0" + "@openzeppelin/contracts-upgradeable": "npm:4.5.2" + patch-package: "npm:^6.4.7" + checksum: 10/6ea79388bd8ed6de2fdb2e1334d37b520928732c86540eaebed1e21a9f2a04dbc11dbae89f06bd66a169130f9b54d90c9fe6ed45cd4d286bc28b4d77fd49c1f8 + languageName: node + linkType: hard + +"@arbitrum/nitro-contracts@npm:^1.0.0-beta.8": + version: 1.3.0 + resolution: "@arbitrum/nitro-contracts@npm:1.3.0" + dependencies: + "@offchainlabs/upgrade-executor": "npm:1.1.0-beta.0" + "@openzeppelin/contracts": "npm:4.5.0" + "@openzeppelin/contracts-upgradeable": "npm:4.5.2" + patch-package: "npm:^6.4.7" + checksum: 10/cc931bf6d65f8249cfe0527b5e7be2bfb30c40ea8408320949db76e20076b91dcbb384f5b5fb997f303f1b4b83310a0f98a5382d4ec1a58be8cf92267d615121 + languageName: node + linkType: hard + +"@arbitrum/token-bridge-contracts@npm:1.1.2": + version: 1.1.2 + resolution: "@arbitrum/token-bridge-contracts@npm:1.1.2" + dependencies: + "@arbitrum/nitro-contracts": "npm:^1.0.0-beta.8" + "@offchainlabs/upgrade-executor": "npm:1.1.0-beta.0" + "@openzeppelin/contracts": "npm:4.8.3" + "@openzeppelin/contracts-upgradeable": "npm:4.8.3" + "@openzeppelin/upgrades-core": "npm:^1.24.1" + dependenciesMeta: + "@openzeppelin/upgrades-core": + optional: true + checksum: 10/d9a1b69db886e4d34f34f9b92dc226ee2add122328da9dc79a4046322a486a731f5992b8e22a0929b1bb717f9d1d1b60b43085fb952a50e955447b3d7aa1bf0c + languageName: node + linkType: hard + "@ardatan/relay-compiler@npm:12.0.0": version: 12.0.0 resolution: "@ardatan/relay-compiler@npm:12.0.0" @@ -1832,6 +1872,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.5.5": + version: 7.27.0 + resolution: "@babel/runtime@npm:7.27.0" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10/e6966e03b695feb4c0ac0856a4355231c2580bf9ebd0298f47739f85c0ea658679dd84409daf26378d42c86c1cbe7e33feab709b14e784254b6c441d91606465 + languageName: node + linkType: hard + "@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3": version: 7.22.15 resolution: "@babel/template@npm:7.22.15" @@ -1916,6 +1965,31 @@ __metadata: languageName: node linkType: hard +"@bytecodealliance/preview2-shim@npm:0.17.0": + version: 0.17.0 + resolution: "@bytecodealliance/preview2-shim@npm:0.17.0" + checksum: 10/28a273227d8e8f2b61ad0260be612fd854ace756784c409c6ac4b65bf6b48426e6c058e45c07675303ef844a981fbdda7257df9833ca12bd3e5e4a0480ca5193 + languageName: node + linkType: hard + +"@chainlink/contracts@npm:^1.3.0": + version: 1.3.0 + resolution: "@chainlink/contracts@npm:1.3.0" + dependencies: + "@arbitrum/nitro-contracts": "npm:1.1.1" + "@arbitrum/token-bridge-contracts": "npm:1.1.2" + "@changesets/changelog-github": "npm:^0.5.0" + "@changesets/cli": "npm:~2.27.8" + "@eth-optimism/contracts": "npm:0.6.0" + "@openzeppelin/contracts": "npm:4.9.3" + "@openzeppelin/contracts-upgradeable": "npm:4.9.3" + "@scroll-tech/contracts": "npm:0.1.0" + "@zksync/contracts": "git+https://github.com/matter-labs/era-contracts.git#446d391d34bdb48255d5f8fef8a8248925fc98b9" + semver: "npm:^7.6.3" + checksum: 10/223e80492520cccad301ba360a27c11c73070cc8e9d03af73f68db987f9ad1e0a43f98e9feb8f284d68e9c79273647d3fadb7477532259de96840cfc67d2ebf3 + languageName: node + linkType: hard + "@chainsafe/is-ip@npm:^2.0.1": version: 2.1.0 resolution: "@chainsafe/is-ip@npm:2.1.0" @@ -1932,6 +2006,261 @@ __metadata: languageName: node linkType: hard +"@changesets/apply-release-plan@npm:^7.0.8": + version: 7.0.10 + resolution: "@changesets/apply-release-plan@npm:7.0.10" + dependencies: + "@changesets/config": "npm:^3.1.1" + "@changesets/get-version-range-type": "npm:^0.4.0" + "@changesets/git": "npm:^3.0.2" + "@changesets/should-skip-package": "npm:^0.1.2" + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + detect-indent: "npm:^6.0.0" + fs-extra: "npm:^7.0.1" + lodash.startcase: "npm:^4.4.0" + outdent: "npm:^0.5.0" + prettier: "npm:^2.7.1" + resolve-from: "npm:^5.0.0" + semver: "npm:^7.5.3" + checksum: 10/8d37aa245dd0879fbb90a65cbeafd6b32b0076dcec5f49a6663812cb58eec6e7e9195c16e2050a34e0400741d573d85fc4a807d1ae1f427fb88df914f9a4e182 + languageName: node + linkType: hard + +"@changesets/assemble-release-plan@npm:^6.0.5, @changesets/assemble-release-plan@npm:^6.0.6": + version: 6.0.6 + resolution: "@changesets/assemble-release-plan@npm:6.0.6" + dependencies: + "@changesets/errors": "npm:^0.2.0" + "@changesets/get-dependents-graph": "npm:^2.1.3" + "@changesets/should-skip-package": "npm:^0.1.2" + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + semver: "npm:^7.5.3" + checksum: 10/b6c7ce7231e4c1801255d15e99355c700dc6fd62abb5330817231e2f45edd06fa7d31aac0ed3b1908a6cde33ef0c5bf2c1e71f2e03d37435131f2a4d4d48aaf8 + languageName: node + linkType: hard + +"@changesets/changelog-git@npm:^0.2.0": + version: 0.2.1 + resolution: "@changesets/changelog-git@npm:0.2.1" + dependencies: + "@changesets/types": "npm:^6.1.0" + checksum: 10/c22f3c0baf50c102a6890046351ee42f65ff6d58747ba4f75e5e40da1ed5fbcfd0dc2d11cdfb86acbb3262e58acb93f096c798827cac570c1e22e8f32f58a30f + languageName: node + linkType: hard + +"@changesets/changelog-github@npm:^0.5.0": + version: 0.5.1 + resolution: "@changesets/changelog-github@npm:0.5.1" + dependencies: + "@changesets/get-github-info": "npm:^0.6.0" + "@changesets/types": "npm:^6.1.0" + dotenv: "npm:^8.1.0" + checksum: 10/1284e7dc067652edfa14792196e6036849455d121afabe63e8d1a7dc0e8fb0310edb58d1130f2a5944819ae4011eeecc7e0c44c1cda43e6a581a3add187c3447 + languageName: node + linkType: hard + +"@changesets/cli@npm:~2.27.8": + version: 2.27.12 + resolution: "@changesets/cli@npm:2.27.12" + dependencies: + "@changesets/apply-release-plan": "npm:^7.0.8" + "@changesets/assemble-release-plan": "npm:^6.0.5" + "@changesets/changelog-git": "npm:^0.2.0" + "@changesets/config": "npm:^3.0.5" + "@changesets/errors": "npm:^0.2.0" + "@changesets/get-dependents-graph": "npm:^2.1.2" + "@changesets/get-release-plan": "npm:^4.0.6" + "@changesets/git": "npm:^3.0.2" + "@changesets/logger": "npm:^0.1.1" + "@changesets/pre": "npm:^2.0.1" + "@changesets/read": "npm:^0.6.2" + "@changesets/should-skip-package": "npm:^0.1.1" + "@changesets/types": "npm:^6.0.0" + "@changesets/write": "npm:^0.3.2" + "@manypkg/get-packages": "npm:^1.1.3" + ansi-colors: "npm:^4.1.3" + ci-info: "npm:^3.7.0" + enquirer: "npm:^2.4.1" + external-editor: "npm:^3.1.0" + fs-extra: "npm:^7.0.1" + mri: "npm:^1.2.0" + p-limit: "npm:^2.2.0" + package-manager-detector: "npm:^0.2.0" + picocolors: "npm:^1.1.0" + resolve-from: "npm:^5.0.0" + semver: "npm:^7.5.3" + spawndamnit: "npm:^3.0.1" + term-size: "npm:^2.1.0" + bin: + changeset: bin.js + checksum: 10/06618abc60ddd9bb82d0380ee6bdea926cce8ebd76e18eb38487fa2501ee1386ffaf55042c8d052d783bcfd2669c51f3eef8b0b0cfc7624486bcec42ac0da9da + languageName: node + linkType: hard + +"@changesets/config@npm:^3.0.5, @changesets/config@npm:^3.1.1": + version: 3.1.1 + resolution: "@changesets/config@npm:3.1.1" + dependencies: + "@changesets/errors": "npm:^0.2.0" + "@changesets/get-dependents-graph": "npm:^2.1.3" + "@changesets/logger": "npm:^0.1.1" + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + fs-extra: "npm:^7.0.1" + micromatch: "npm:^4.0.8" + checksum: 10/9500e02b68801f052478b3e10523bd3a39b9e5e989e718832832537c9da965580f496262c2bc3f6e23a4e6fb4303f730a69dcbf2041f68d2fa7bd03dd1f82db0 + languageName: node + linkType: hard + +"@changesets/errors@npm:^0.2.0": + version: 0.2.0 + resolution: "@changesets/errors@npm:0.2.0" + dependencies: + extendable-error: "npm:^0.1.5" + checksum: 10/4b79373f92287af4f723e8dbbccaf0299aa8735fc043243d0ad587f04a7614615ea50180be575d4438b9f00aa82d1cf85e902b77a55bdd3e0a8dd97e77b18c60 + languageName: node + linkType: hard + +"@changesets/get-dependents-graph@npm:^2.1.2, @changesets/get-dependents-graph@npm:^2.1.3": + version: 2.1.3 + resolution: "@changesets/get-dependents-graph@npm:2.1.3" + dependencies: + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + picocolors: "npm:^1.1.0" + semver: "npm:^7.5.3" + checksum: 10/33f2bb5dc88443b68fd796fd3b019a553fb3e21cb957a8a117db2a6770ad81f7c156ebdc3b12cfa75169de918f11271a71f61034aec48a53bf1a936d6d783e3d + languageName: node + linkType: hard + +"@changesets/get-github-info@npm:^0.6.0": + version: 0.6.0 + resolution: "@changesets/get-github-info@npm:0.6.0" + dependencies: + dataloader: "npm:^1.4.0" + node-fetch: "npm:^2.5.0" + checksum: 10/4ba61eafb0a75fa7f741885b465d90559e63581e748527e060f90c37380a02f62810db3bc79a4e74d109754d7f72dc45249e1ac2be5fcaec6a7d0f99db1cee78 + languageName: node + linkType: hard + +"@changesets/get-release-plan@npm:^4.0.6": + version: 4.0.8 + resolution: "@changesets/get-release-plan@npm:4.0.8" + dependencies: + "@changesets/assemble-release-plan": "npm:^6.0.6" + "@changesets/config": "npm:^3.1.1" + "@changesets/pre": "npm:^2.0.2" + "@changesets/read": "npm:^0.6.3" + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + checksum: 10/9d61bc348d99cede703b7efa66aebf2bb8fcf4868491bd311aec3a36c75c966fde45582573d4f03a2c31931dfd3cf318e359b9c86c1af3b41eecabf5da50e0a7 + languageName: node + linkType: hard + +"@changesets/get-version-range-type@npm:^0.4.0": + version: 0.4.0 + resolution: "@changesets/get-version-range-type@npm:0.4.0" + checksum: 10/9868e99b31af652d3fa08fc33d55b9636f2feed1f4efdb318a6dbb4bb061281868de089b93041ce7f2775ab9cf454b92b1199767d0f4f228d8bbc483e61d2fd8 + languageName: node + linkType: hard + +"@changesets/git@npm:^3.0.2": + version: 3.0.2 + resolution: "@changesets/git@npm:3.0.2" + dependencies: + "@changesets/errors": "npm:^0.2.0" + "@manypkg/get-packages": "npm:^1.1.3" + is-subdir: "npm:^1.1.1" + micromatch: "npm:^4.0.8" + spawndamnit: "npm:^3.0.1" + checksum: 10/de63573fecbd2ddcb8b5a7bfe18344a849810035e6fc55aa05e022d42e8cbefdfe23eebcfd34d31e84d78a616aa80ffb239b9e24abc4fc3ebaba10e619f72a24 + languageName: node + linkType: hard + +"@changesets/logger@npm:^0.1.1": + version: 0.1.1 + resolution: "@changesets/logger@npm:0.1.1" + dependencies: + picocolors: "npm:^1.1.0" + checksum: 10/bbfc050ddd0afdaa95bb790e81894b7548a2def059deeaed1685e22c10ede245ec2264df42bb2200cc0c8bd040e427bcd68a7afcca2633dc263a28e923d7c175 + languageName: node + linkType: hard + +"@changesets/parse@npm:^0.4.1": + version: 0.4.1 + resolution: "@changesets/parse@npm:0.4.1" + dependencies: + "@changesets/types": "npm:^6.1.0" + js-yaml: "npm:^3.13.1" + checksum: 10/2973ab8f38592a80efea589e148e5bdfd6ed3af86aa9206f941b5b3955f68464bf70a5965349f642667c708ebae60e4266be538328cd27075cace3f7cc1022e3 + languageName: node + linkType: hard + +"@changesets/pre@npm:^2.0.1, @changesets/pre@npm:^2.0.2": + version: 2.0.2 + resolution: "@changesets/pre@npm:2.0.2" + dependencies: + "@changesets/errors": "npm:^0.2.0" + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + fs-extra: "npm:^7.0.1" + checksum: 10/daaedd2747492ced61f107d38f90e535607bcb073b10ffac3d9e3bcad1a4cc082370884224fc6785af2d92d37f6b0a3bf853f9759b8fda294878d00d24344415 + languageName: node + linkType: hard + +"@changesets/read@npm:^0.6.2, @changesets/read@npm:^0.6.3": + version: 0.6.3 + resolution: "@changesets/read@npm:0.6.3" + dependencies: + "@changesets/git": "npm:^3.0.2" + "@changesets/logger": "npm:^0.1.1" + "@changesets/parse": "npm:^0.4.1" + "@changesets/types": "npm:^6.1.0" + fs-extra: "npm:^7.0.1" + p-filter: "npm:^2.1.0" + picocolors: "npm:^1.1.0" + checksum: 10/27f54da242114fc916bb1ffa6e559bdde7c2078c0e6560dae06b66b6760b445e438f560782c545088e348c08e9c484fae909f6823da2c1e67b8235ea8c8e8826 + languageName: node + linkType: hard + +"@changesets/should-skip-package@npm:^0.1.1, @changesets/should-skip-package@npm:^0.1.2": + version: 0.1.2 + resolution: "@changesets/should-skip-package@npm:0.1.2" + dependencies: + "@changesets/types": "npm:^6.1.0" + "@manypkg/get-packages": "npm:^1.1.3" + checksum: 10/d09fcf1200ee201f0dd5b8049d90e8b5e0cfd34cc94f5c661c4cdab182a8263628733f9bc5886550a92f6f7857339d79fc77f12ffd53559b029a2bf9a2fa7ace + languageName: node + linkType: hard + +"@changesets/types@npm:^4.0.1": + version: 4.1.0 + resolution: "@changesets/types@npm:4.1.0" + checksum: 10/4d7c65a447400ac474b2dc2d79bc1a5341c305fbce4a648ef59d9939bc1bbbbd6852684c417a9a4ef0226468b9cb522b9ac2b5393f21fa5f20f1b12bee94eab5 + languageName: node + linkType: hard + +"@changesets/types@npm:^6.0.0, @changesets/types@npm:^6.1.0": + version: 6.1.0 + resolution: "@changesets/types@npm:6.1.0" + checksum: 10/2dcd00712cb85d0c53afdd8d0e856b4bf9c0ce8dc36c838c918d44799aacd9ba8659b9ff610ff92b94fc03c8fd2b52c5b05418fcf8a1bd138cd9182414ede373 + languageName: node + linkType: hard + +"@changesets/write@npm:^0.3.2": + version: 0.3.2 + resolution: "@changesets/write@npm:0.3.2" + dependencies: + "@changesets/types": "npm:^6.0.0" + fs-extra: "npm:^7.0.1" + human-id: "npm:^1.0.2" + prettier: "npm:^2.7.1" + checksum: 10/c16b0a731fa43ae0028fd1f956c7b080030c42ff763f8dac74da8b178a4ea65632831c30550b784286277bdc75a3c44dda46aad8db97f43bb1eb4d61922152aa + languageName: node + linkType: hard + "@coinbase/wallet-sdk@npm:4.3.0": version: 4.3.0 resolution: "@coinbase/wallet-sdk@npm:4.3.0" @@ -2779,6 +3108,43 @@ __metadata: languageName: node linkType: hard +"@eth-optimism/contracts@npm:0.6.0": + version: 0.6.0 + resolution: "@eth-optimism/contracts@npm:0.6.0" + dependencies: + "@eth-optimism/core-utils": "npm:0.12.0" + "@ethersproject/abstract-provider": "npm:^5.7.0" + "@ethersproject/abstract-signer": "npm:^5.7.0" + peerDependencies: + ethers: ^5 + checksum: 10/dd1fa303ca39125d45fa71a2be0fe773971a986d0694ba98075b9b93ee3c0c71764fd061f1094f82c36d5aa167f5340ec92ef1ec45d901cb69ace086327c0cf2 + languageName: node + linkType: hard + +"@eth-optimism/core-utils@npm:0.12.0": + version: 0.12.0 + resolution: "@eth-optimism/core-utils@npm:0.12.0" + dependencies: + "@ethersproject/abi": "npm:^5.7.0" + "@ethersproject/abstract-provider": "npm:^5.7.0" + "@ethersproject/address": "npm:^5.7.0" + "@ethersproject/bignumber": "npm:^5.7.0" + "@ethersproject/bytes": "npm:^5.7.0" + "@ethersproject/constants": "npm:^5.7.0" + "@ethersproject/contracts": "npm:^5.7.0" + "@ethersproject/hash": "npm:^5.7.0" + "@ethersproject/keccak256": "npm:^5.7.0" + "@ethersproject/properties": "npm:^5.7.0" + "@ethersproject/providers": "npm:^5.7.0" + "@ethersproject/rlp": "npm:^5.7.0" + "@ethersproject/transactions": "npm:^5.7.0" + "@ethersproject/web": "npm:^5.7.0" + bufio: "npm:^1.0.7" + chai: "npm:^4.3.4" + checksum: 10/a7ea17a8b529b2c86b00ef19fa562c2b792d7e8a4071defea4d8a8b82a101105a3ab6dc86361118e17bf9b4784b4eca9c1e937c8b1e7294a1a850f97b5a73a10 + languageName: node + linkType: hard + "@ethereumjs/common@npm:^3.2.0": version: 3.2.0 resolution: "@ethereumjs/common@npm:3.2.0" @@ -4571,7 +4937,7 @@ __metadata: "@kleros/escrow-v2-eslint-config": "workspace:^" "@kleros/escrow-v2-prettier-config": "workspace:^" "@kleros/escrow-v2-tsconfig": "workspace:^" - "@kleros/kleros-v2-contracts": "npm:^0.7.0" + "@kleros/kleros-v2-contracts": "npm:^0.8.1" "@logtail/pino": "npm:^0.4.0" "@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.8" "@nomicfoundation/hardhat-ethers": "npm:^3.0.8" @@ -4664,7 +5030,7 @@ __metadata: "@cyntler/react-doc-viewer": "npm:^1.16.3" "@graphql-codegen/cli": "npm:^4.0.1" "@graphql-codegen/client-preset": "npm:^4.6.2" - "@kleros/kleros-app": "npm:^2.0.2" + "@kleros/kleros-app": "npm:^2.1.0" "@kleros/ui-components-library": "npm:^2.19.0" "@reown/appkit": "npm:^1.6.6" "@reown/appkit-adapter-wagmi": "npm:^1.6.6" @@ -4720,9 +5086,9 @@ __metadata: languageName: unknown linkType: soft -"@kleros/kleros-app@npm:^2.0.2": - version: 2.0.2 - resolution: "@kleros/kleros-app@npm:2.0.2" +"@kleros/kleros-app@npm:^2.1.0": + version: 2.1.0 + resolution: "@kleros/kleros-app@npm:2.1.0" dependencies: jose: "npm:^5.9.6" peerDependencies: @@ -4732,18 +5098,20 @@ __metadata: react: ^18.3.1 react-dom: ^18.3.1 viem: ^2.21.42 - wagmi: ^2.13.0 - checksum: 10/89cf0536fed4bbb887772daa529d7cad209cea0e5105bcd366fe5e4bc7c5c14fca21aa201ba4d848c7e8addd3fc4921ac54e237afe2a5b7224c9cd219f72e08b + wagmi: ^2.14.0 + checksum: 10/4441b6a5764d03bb411abf698ecaedd9a1b60acdef9470da5a422d7326b3859cf5509077d36f5009a7bbc6b4bd24ce17ace399a65476b2ee3005cf034ac02a90 languageName: node linkType: hard -"@kleros/kleros-v2-contracts@npm:^0.7.0": - version: 0.7.0 - resolution: "@kleros/kleros-v2-contracts@npm:0.7.0" +"@kleros/kleros-v2-contracts@npm:^0.8.1": + version: 0.8.1 + resolution: "@kleros/kleros-v2-contracts@npm:0.8.1" dependencies: - "@kleros/vea-contracts": "npm:^0.4.0" - viem: "npm:^2.21.35" - checksum: 10/78c9762e45393eb3247755c6f9e39c8ec9020793918aca6e3fe7d970522eae91e16f9e81e653c3f05c26c375a4a5447889680cebdccedbf9a24345e74b289883 + "@chainlink/contracts": "npm:^1.3.0" + "@kleros/vea-contracts": "npm:^0.6.0" + "@openzeppelin/contracts": "npm:^5.2.0" + viem: "npm:^2.24.1" + checksum: 10/11dc365d94450adc13b5dd3ff4e9c64b496808466304d4ac88deed98f5582bdd06c3f908bd8eaaaf6cacd99179d1367f9768eb6873354c74e8b548055586bdc2 languageName: node linkType: hard @@ -4770,10 +5138,10 @@ __metadata: languageName: node linkType: hard -"@kleros/vea-contracts@npm:^0.4.0": - version: 0.4.0 - resolution: "@kleros/vea-contracts@npm:0.4.0" - checksum: 10/6e60eddf4f0bc9e687ddb83d634d800c75dc6bdd41be9f8904876f977dce2f661e183c4b3fc19d773d61b4b1d94fd4639c63d355d30e91f16f42d931a46dcbd5 +"@kleros/vea-contracts@npm:^0.6.0": + version: 0.6.0 + resolution: "@kleros/vea-contracts@npm:0.6.0" + checksum: 10/1dafd94620d3392c2e00e09e7d1ca923007143f8625b4b584411a7b49404ae5630e870d3e260685964d37ccb9c4c4ab406523b8ec4dd9f89bcf6099a4f5976ec languageName: node linkType: hard @@ -4929,6 +5297,32 @@ __metadata: languageName: node linkType: hard +"@manypkg/find-root@npm:^1.1.0": + version: 1.1.0 + resolution: "@manypkg/find-root@npm:1.1.0" + dependencies: + "@babel/runtime": "npm:^7.5.5" + "@types/node": "npm:^12.7.1" + find-up: "npm:^4.1.0" + fs-extra: "npm:^8.1.0" + checksum: 10/31e7dde82612a0e37ebb07876d76b1bf2aedc5b285b5e50d94cdf63edbf1fa3970349b84a5837a3c687e5b643e9a4f4588ae1f4b4ae9d412516d57bf977a08db + languageName: node + linkType: hard + +"@manypkg/get-packages@npm:^1.1.3": + version: 1.1.3 + resolution: "@manypkg/get-packages@npm:1.1.3" + dependencies: + "@babel/runtime": "npm:^7.5.5" + "@changesets/types": "npm:^4.0.1" + "@manypkg/find-root": "npm:^1.1.0" + fs-extra: "npm:^8.1.0" + globby: "npm:^11.0.0" + read-yaml-file: "npm:^1.1.0" + checksum: 10/4912e002199ff3974ec48586376a04c5f1815a4faa5f4d36b0698838eec143c9d4e3d42c41e0de009f48a1e2251802ed63c1311ab44de225b50102f85919a248 + languageName: node + linkType: hard + "@mapbox/node-pre-gyp@npm:^1.0.0": version: 1.0.11 resolution: "@mapbox/node-pre-gyp@npm:1.0.11" @@ -5668,6 +6062,15 @@ __metadata: languageName: node linkType: hard +"@nomicfoundation/slang@npm:^0.18.3": + version: 0.18.3 + resolution: "@nomicfoundation/slang@npm:0.18.3" + dependencies: + "@bytecodealliance/preview2-shim": "npm:0.17.0" + checksum: 10/1dcf687e4719844bffc688d13d15c0db3218ab05983d6b53777a3172c7df157c105171e802fe7812d9fd2bdb4dcd8d7287367c851eed4dfd76621e799c14574f + languageName: node + linkType: hard + "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1": version: 0.1.1 resolution: "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1" @@ -5900,6 +6303,72 @@ __metadata: languageName: node linkType: hard +"@offchainlabs/upgrade-executor@npm:1.1.0-beta.0": + version: 1.1.0-beta.0 + resolution: "@offchainlabs/upgrade-executor@npm:1.1.0-beta.0" + dependencies: + "@openzeppelin/contracts": "npm:4.7.3" + "@openzeppelin/contracts-upgradeable": "npm:4.7.3" + checksum: 10/a8cd0cc24103cc42021c452220005efde535ba3596ec2ba5eb6dc299d1f3291c38a3d859621d7983bd7c43c80606d6e7d906e1081a1e499455ddea7ba64ab355 + languageName: node + linkType: hard + +"@openzeppelin/contracts-upgradeable@npm:4.5.2": + version: 4.5.2 + resolution: "@openzeppelin/contracts-upgradeable@npm:4.5.2" + checksum: 10/5e246da7a44bb982a312ebf79978735712140692d46273566e490159b98b9041ca72cc08c3d05172137a389be4caad5afc001480bc5557f3d47162f4626e3723 + languageName: node + linkType: hard + +"@openzeppelin/contracts-upgradeable@npm:4.7.3": + version: 4.7.3 + resolution: "@openzeppelin/contracts-upgradeable@npm:4.7.3" + checksum: 10/7c72ffeca867478b5aa8e8c7adb3d1ce114cfdc797ed4f3cd074788cf4da25d620ffffd624ac7e9d1223eecffeea9f7b79200ff70dc464cc828c470ccd12ddf1 + languageName: node + linkType: hard + +"@openzeppelin/contracts-upgradeable@npm:4.8.3": + version: 4.8.3 + resolution: "@openzeppelin/contracts-upgradeable@npm:4.8.3" + checksum: 10/1ff70629f509221ef948da6de582fd19a6cf7deea884f0c2de1347ca5eb1f3910099f92fcaf1a70fcae982d8f95b58f48548d833e6ad708e5d7afbae1556fae8 + languageName: node + linkType: hard + +"@openzeppelin/contracts-upgradeable@npm:4.9.3": + version: 4.9.3 + resolution: "@openzeppelin/contracts-upgradeable@npm:4.9.3" + checksum: 10/d8fd6fd9d2271fbdd3958c20769b72a241687883ecd3bea05a3969568cdcabdee9d53c21ac776a651c397507d9c22d8db0a4fb970d27bdab918979fae7285a2f + languageName: node + linkType: hard + +"@openzeppelin/contracts@npm:4.5.0": + version: 4.5.0 + resolution: "@openzeppelin/contracts@npm:4.5.0" + checksum: 10/8bfa1733732420331728cedd7f1f5f4e4ae0700b32c9e5def19b2d42dbb0b246709e8e22abd457e8269d743012ff2aed4e3f100a942f45d9507cb78d5dbd435b + languageName: node + linkType: hard + +"@openzeppelin/contracts@npm:4.7.3": + version: 4.7.3 + resolution: "@openzeppelin/contracts@npm:4.7.3" + checksum: 10/3d16ed8943938373ecc331c2ab83c3e8d0d89aed0c2a109aaa61ca6524b4c31cb5a81185c6f93ce9ee2dda685a4328fd85bd217929ae598f4be813d5d4cd1b78 + languageName: node + linkType: hard + +"@openzeppelin/contracts@npm:4.8.3": + version: 4.8.3 + resolution: "@openzeppelin/contracts@npm:4.8.3" + checksum: 10/276481d76afdc71690bd4204cdd47e6add30d183e20df57c76e5ffc481c783ca756842f3b0ac7e3e6336217dcde448cef8279fafae1176ac436ad86594c4bdc2 + languageName: node + linkType: hard + +"@openzeppelin/contracts@npm:4.9.3": + version: 4.9.3 + resolution: "@openzeppelin/contracts@npm:4.9.3" + checksum: 10/ce0a16a56a39b62d72370ac702bce1917096492442ff05de88521beda2c3f3935b93ee2b9a184614dd543a6181f2f0be10243f5a629be87aab284ade68c18320 + languageName: node + linkType: hard + "@openzeppelin/contracts@npm:^5.2.0": version: 5.2.0 resolution: "@openzeppelin/contracts@npm:5.2.0" @@ -5907,6 +6376,26 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/upgrades-core@npm:^1.24.1": + version: 1.42.2 + resolution: "@openzeppelin/upgrades-core@npm:1.42.2" + dependencies: + "@nomicfoundation/slang": "npm:^0.18.3" + cbor: "npm:^10.0.0" + chalk: "npm:^4.1.0" + compare-versions: "npm:^6.0.0" + debug: "npm:^4.1.1" + ethereumjs-util: "npm:^7.0.3" + minimatch: "npm:^9.0.5" + minimist: "npm:^1.2.7" + proper-lockfile: "npm:^4.1.1" + solidity-ast: "npm:^0.4.51" + bin: + openzeppelin-upgrades-core: dist/cli/cli.js + checksum: 10/7000c7cf6822eab2b8a927acc1f09b769004667644e389ae582cd4f87f74433cdd3bc80477f95990d40bb60c15b85e61e5ad4cd47e0e7e70c4e5cbef6cbad10c + languageName: node + linkType: hard + "@parcel/watcher-android-arm64@npm:2.4.0": version: 2.4.0 resolution: "@parcel/watcher-android-arm64@npm:2.4.0" @@ -6708,6 +7197,13 @@ __metadata: languageName: node linkType: hard +"@scroll-tech/contracts@npm:0.1.0": + version: 0.1.0 + resolution: "@scroll-tech/contracts@npm:0.1.0" + checksum: 10/7b32c4fbd7bafccb4c44f435764e9869486f0094759db24fca5021a3001ea61983a1902eff772c3d003a16470bde28859c975b3a6736264d651695dfbfc3665b + languageName: node + linkType: hard + "@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0": version: 1.1.5 resolution: "@scure/base@npm:1.1.5" @@ -8073,7 +8569,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^12.12.54": +"@types/node@npm:^12.12.54, @types/node@npm:^12.7.1": version: 12.20.55 resolution: "@types/node@npm:12.20.55" checksum: 10/1f916a06fff02faadb09a16ed6e31820ce170798b202ef0b14fc244bfbd721938c54a3a99836e185e4414ca461fe96c5bb5c67c3d248f153555b7e6347f061dd @@ -9330,6 +9826,13 @@ __metadata: languageName: node linkType: hard +"@yarnpkg/lockfile@npm:^1.1.0": + version: 1.1.0 + resolution: "@yarnpkg/lockfile@npm:1.1.0" + checksum: 10/cd19e1114aaf10a05126aeea8833ef4ca8af8a46e88e12884f8359d19333fd19711036dbc2698dbe937f81f037070cf9a8da45c2e8c6ca19cafd7d15659094ed + languageName: node + linkType: hard + "@yornaath/batshit-devtools@npm:^1.6.0": version: 1.6.0 resolution: "@yornaath/batshit-devtools@npm:1.6.0" @@ -9346,6 +9849,13 @@ __metadata: languageName: node linkType: hard +"@zksync/contracts@git+https://github.com/matter-labs/era-contracts.git#446d391d34bdb48255d5f8fef8a8248925fc98b9": + version: 0.1.0 + resolution: "@zksync/contracts@https://github.com/matter-labs/era-contracts.git#commit=446d391d34bdb48255d5f8fef8a8248925fc98b9" + checksum: 10/982b27c109e55a332f6690e164230a033f3c8292dc816b46798704410796caee5b7b3336d9fd238b5b2aedc7a8ffb54ee294e948d11cfb22e925a4c17392e5ab + languageName: node + linkType: hard + "JSONStream@npm:^1.0.4, JSONStream@npm:^1.3.5": version: 1.3.5 resolution: "JSONStream@npm:1.3.5" @@ -9741,7 +10251,7 @@ __metadata: languageName: node linkType: hard -"ansi-colors@npm:^4.1.1": +"ansi-colors@npm:^4.1.1, ansi-colors@npm:^4.1.3": version: 4.1.3 resolution: "ansi-colors@npm:4.1.3" checksum: 10/43d6e2fc7b1c6e4dc373de708ee76311ec2e0433e7e8bd3194e7ff123ea6a747428fc61afdcf5969da5be3a5f0fd054602bec56fc0ebe249ce2fcde6e649e3c2 @@ -10599,6 +11109,15 @@ __metadata: languageName: node linkType: hard +"better-path-resolve@npm:1.0.0": + version: 1.0.0 + resolution: "better-path-resolve@npm:1.0.0" + dependencies: + is-windows: "npm:^1.0.0" + checksum: 10/5392dbe04e7fe68b944eb37961d9dfa147aaac3ee9ee3f6e13d42e2c9fbe949e68d16e896c14ee9016fa5f8e6e53ec7fd8b5f01b50a32067a7d94ac9cfb9a050 + languageName: node + linkType: hard + "bfj@npm:^7.0.2": version: 7.1.0 resolution: "bfj@npm:7.1.0" @@ -11043,6 +11562,13 @@ __metadata: languageName: node linkType: hard +"bufio@npm:^1.0.7": + version: 1.2.3 + resolution: "bufio@npm:1.2.3" + checksum: 10/9a79112cdba23d1a319c688b4a53af75dcae27e462915536883ec458a45e6b589f5bb01693e09eba2def1e5f89005d11084d6dcf733d2d5f96007a6d95a42c58 + languageName: node + linkType: hard + "builtin-modules@npm:^3.1.0": version: 3.3.0 resolution: "builtin-modules@npm:3.3.0" @@ -11292,6 +11818,15 @@ __metadata: languageName: node linkType: hard +"cbor@npm:^10.0.0": + version: 10.0.3 + resolution: "cbor@npm:10.0.3" + dependencies: + nofilter: "npm:^3.0.2" + checksum: 10/ff33c3404c3acc8afc448163a7b32eea39f4f99d641ac496352a6830256617a0b1d49b2862746b6b150e8931b6f6da10572d78c28af3a64b6836881c33c5d942 + languageName: node + linkType: hard + "cborg@npm:^4.0.0": version: 4.2.8 resolution: "cborg@npm:4.2.8" @@ -11329,7 +11864,7 @@ __metadata: languageName: node linkType: hard -"chai@npm:^4.5.0": +"chai@npm:^4.3.4, chai@npm:^4.5.0": version: 4.5.0 resolution: "chai@npm:4.5.0" dependencies: @@ -11543,7 +12078,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.2.0": +"ci-info@npm:^3.2.0, ci-info@npm:^3.7.0": version: 3.9.0 resolution: "ci-info@npm:3.9.0" checksum: 10/75bc67902b4d1c7b435497adeb91598f6d52a3389398e44294f6601b20cfef32cf2176f7be0eb961d9e085bb333a8a5cae121cb22f81cf238ae7f58eb80e9397 @@ -11989,6 +12524,13 @@ __metadata: languageName: node linkType: hard +"compare-versions@npm:^6.0.0": + version: 6.1.1 + resolution: "compare-versions@npm:6.1.1" + checksum: 10/9325c0fadfba81afa0ec17e6fc2ef823ba785c693089698b8d9374e5460509f1916a88591644d4cb4045c9a58e47fafbcc0724fe8bf446d2a875a3d6eeddf165 + languageName: node + linkType: hard + "compressible@npm:~2.0.16": version: 2.0.18 resolution: "compressible@npm:2.0.18" @@ -12587,6 +13129,30 @@ __metadata: languageName: node linkType: hard +"cross-spawn@npm:^6.0.5": + version: 6.0.6 + resolution: "cross-spawn@npm:6.0.6" + dependencies: + nice-try: "npm:^1.0.4" + path-key: "npm:^2.0.1" + semver: "npm:^5.5.0" + shebang-command: "npm:^1.2.0" + which: "npm:^1.2.9" + checksum: 10/7abf6137b23293103a22bfeaf320f2d63faae70d97ddb4b58597237501d2efdd84cdc69a30246977e0c5f68216593894d41a7f122915dd4edf448db14c74171b + languageName: node + linkType: hard + +"cross-spawn@npm:^7.0.5": + version: 7.0.6 + resolution: "cross-spawn@npm:7.0.6" + dependencies: + path-key: "npm:^3.1.0" + shebang-command: "npm:^2.0.0" + which: "npm:^2.0.1" + checksum: 10/0d52657d7ae36eb130999dffff1168ec348687b48dd38e2ff59992ed916c88d328cf1d07ff4a4a10bc78de5e1c23f04b306d569e42f7a2293915c081e4dfee86 + languageName: node + linkType: hard + "crypt@npm:>= 0.0.1": version: 0.0.2 resolution: "crypt@npm:0.0.2" @@ -12963,6 +13529,13 @@ __metadata: languageName: node linkType: hard +"dataloader@npm:^1.4.0": + version: 1.4.0 + resolution: "dataloader@npm:1.4.0" + checksum: 10/8dc2181f7fc243f657aa97b5aa51b9e0da88dee9a59a689bab50d4bac826c27ae0457db8d9a5d59559d636f6b997f419303ccfde595cc26191f37ab9c792fe01 + languageName: node + linkType: hard + "dataloader@npm:^2.2.2": version: 2.2.2 resolution: "dataloader@npm:2.2.2" @@ -13696,6 +14269,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:^8.1.0": + version: 8.6.0 + resolution: "dotenv@npm:8.6.0" + checksum: 10/31d7b5c010cebb80046ba6853d703f9573369b00b15129536494f04b0af4ea0060ce8646e3af58b455af2f6f1237879dd261a5831656410ec92561ae1ea44508 + languageName: node + linkType: hard + "dset@npm:^3.1.2": version: 3.1.3 resolution: "dset@npm:3.1.3" @@ -13977,7 +14557,7 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.0, enquirer@npm:^2.3.6": +"enquirer@npm:^2.3.0, enquirer@npm:^2.3.6, enquirer@npm:^2.4.1": version: 2.4.1 resolution: "enquirer@npm:2.4.1" dependencies: @@ -15135,7 +15715,7 @@ __metadata: languageName: node linkType: hard -"ethereumjs-util@npm:^7.1.5": +"ethereumjs-util@npm:^7.0.3, ethereumjs-util@npm:^7.1.5": version: 7.1.5 resolution: "ethereumjs-util@npm:7.1.5" dependencies: @@ -15416,6 +15996,13 @@ __metadata: languageName: node linkType: hard +"extendable-error@npm:^0.1.5": + version: 0.1.7 + resolution: "extendable-error@npm:0.1.7" + checksum: 10/80478be7429a1675d2085f701239796bab3230ed6f2fb1b138fbabec24bea6516b7c5ceb6e9c209efcc9c089948d93715703845653535f8e8a49655066a9255e + languageName: node + linkType: hard + "extension-port-stream@npm:^3.0.0": version: 3.0.0 resolution: "extension-port-stream@npm:3.0.0" @@ -15822,6 +16409,15 @@ __metadata: languageName: node linkType: hard +"find-yarn-workspace-root@npm:^2.0.0": + version: 2.0.0 + resolution: "find-yarn-workspace-root@npm:2.0.0" + dependencies: + micromatch: "npm:^4.0.2" + checksum: 10/7fa7942849eef4d5385ee96a0a9a5a9afe885836fd72ed6a4280312a38690afea275e7d09b343fe97daf0412d833f8ac4b78c17fc756386d9ebebf0759d707a7 + languageName: node + linkType: hard + "flat-cache@npm:^3.0.4": version: 3.2.0 resolution: "flat-cache@npm:3.2.0" @@ -16516,7 +17112,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.3, globby@npm:^11.0.4, globby@npm:^11.1.0": +"globby@npm:^11.0.0, globby@npm:^11.0.3, globby@npm:^11.0.4, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -16652,7 +17248,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10/bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2 @@ -17445,6 +18041,13 @@ __metadata: languageName: node linkType: hard +"human-id@npm:^1.0.2": + version: 1.0.2 + resolution: "human-id@npm:1.0.2" + checksum: 10/16b116ef68c3fc3f65c90b32a338abd0f9ee656a6257baa92c4d7e1154c66469bb6bd4ee840018c35e972aa817f5ae3f0cbabffb78f2ac90aaf02d88a299a371 + languageName: node + linkType: hard + "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -17892,6 +18495,17 @@ __metadata: languageName: node linkType: hard +"is-ci@npm:^2.0.0": + version: 2.0.0 + resolution: "is-ci@npm:2.0.0" + dependencies: + ci-info: "npm:^2.0.0" + bin: + is-ci: bin.js + checksum: 10/77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144 + languageName: node + linkType: hard + "is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.5.0": version: 2.13.1 resolution: "is-core-module@npm:2.13.1" @@ -18220,6 +18834,15 @@ __metadata: languageName: node linkType: hard +"is-subdir@npm:^1.1.1": + version: 1.2.0 + resolution: "is-subdir@npm:1.2.0" + dependencies: + better-path-resolve: "npm:1.0.0" + checksum: 10/31029a383972bff4cc4f1bd1463fd04dde017e0a04ae3a6f6e08124a90c6c4656312d593101b0f38805fa3f3c8f6bc4583524bbf72c50784fa5ca0d3e5a76279 + languageName: node + linkType: hard + "is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": version: 1.0.4 resolution: "is-symbol@npm:1.0.4" @@ -18312,14 +18935,14 @@ __metadata: languageName: node linkType: hard -"is-windows@npm:^1.0.1": +"is-windows@npm:^1.0.0, is-windows@npm:^1.0.1": version: 1.0.2 resolution: "is-windows@npm:1.0.2" checksum: 10/438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7 languageName: node linkType: hard -"is-wsl@npm:^2.2.0": +"is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0": version: 2.2.0 resolution: "is-wsl@npm:2.2.0" dependencies: @@ -19274,7 +19897,7 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:3.x, js-yaml@npm:^3.13.1": +"js-yaml@npm:3.x, js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1": version: 3.14.1 resolution: "js-yaml@npm:3.14.1" dependencies: @@ -19629,6 +20252,15 @@ __metadata: languageName: node linkType: hard +"klaw-sync@npm:^6.0.0": + version: 6.0.0 + resolution: "klaw-sync@npm:6.0.0" + dependencies: + graceful-fs: "npm:^4.1.11" + checksum: 10/0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475 + languageName: node + linkType: hard + "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -21177,7 +21809,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6": +"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f @@ -21607,6 +22239,13 @@ __metadata: languageName: node linkType: hard +"nice-try@npm:^1.0.4": + version: 1.0.5 + resolution: "nice-try@npm:1.0.5" + checksum: 10/0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff + languageName: node + linkType: hard + "no-case@npm:^3.0.4": version: 3.0.4 resolution: "no-case@npm:3.0.4" @@ -21759,6 +22398,13 @@ __metadata: languageName: node linkType: hard +"nofilter@npm:^3.0.2": + version: 3.1.0 + resolution: "nofilter@npm:3.1.0" + checksum: 10/f63d87231dfda4b783db17d75b15aac948f78e65f4f1043096ef441147f6667ff74cd4b3f57ada5dbe240be282d3e9838558ac863a66cb04ef25fff7b2b4be4e + languageName: node + linkType: hard + "nopt@npm:3.x": version: 3.0.6 resolution: "nopt@npm:3.0.6" @@ -22148,6 +22794,16 @@ __metadata: languageName: node linkType: hard +"open@npm:^7.4.2": + version: 7.4.2 + resolution: "open@npm:7.4.2" + dependencies: + is-docker: "npm:^2.0.0" + is-wsl: "npm:^2.1.1" + checksum: 10/4fc02ed3368dcd5d7247ad3566433ea2695b0713b041ebc0eeb2f0f9e5d4e29fc2068f5cdd500976b3464e77fe8b61662b1b059c73233ccc601fe8b16d6c1cd6 + languageName: node + linkType: hard + "open@npm:^8.0.9, open@npm:^8.4.0": version: 8.4.2 resolution: "open@npm:8.4.2" @@ -22257,6 +22913,13 @@ __metadata: languageName: node linkType: hard +"outdent@npm:^0.5.0": + version: 0.5.0 + resolution: "outdent@npm:0.5.0" + checksum: 10/7d94a7d93883afa32c99d84f33248b221f4eeeedbb571921fe0e5cf0bee32e64746c587e9606d98ec22762870c782d21dd4bc3a0edf442d347cb54aa107b198d + languageName: node + linkType: hard + "overlayscrollbars-react@npm:^0.5.3": version: 0.5.3 resolution: "overlayscrollbars-react@npm:0.5.3" @@ -22294,6 +22957,26 @@ __metadata: languageName: node linkType: hard +"ox@npm:0.6.9": + version: 0.6.9 + resolution: "ox@npm:0.6.9" + dependencies: + "@adraffy/ens-normalize": "npm:^1.10.1" + "@noble/curves": "npm:^1.6.0" + "@noble/hashes": "npm:^1.5.0" + "@scure/bip32": "npm:^1.5.0" + "@scure/bip39": "npm:^1.4.0" + abitype: "npm:^1.0.6" + eventemitter3: "npm:5.0.1" + peerDependencies: + typescript: ">=5.4.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/11ad9076b594dd424cd89d9763d4701e59e7ffc0733973947c82a14255a00a53483712e62fa9bbacd39efd35c6739bddb7728ef2211b47530f22036ab77cde69 + languageName: node + linkType: hard + "p-cancelable@npm:^3.0.0": version: 3.0.0 resolution: "p-cancelable@npm:3.0.0" @@ -22325,6 +23008,15 @@ __metadata: languageName: node linkType: hard +"p-filter@npm:^2.1.0": + version: 2.1.0 + resolution: "p-filter@npm:2.1.0" + dependencies: + p-map: "npm:^2.0.0" + checksum: 10/76e552ca624ce2233448d68b19eec9de42b695208121998f7e011edce71d1079a83096ee6a2078fb2a59cfa8a5c999f046edf00ebf16a8e780022010b4693234 + languageName: node + linkType: hard + "p-limit@npm:3.1.0, p-limit@npm:^3.0.2": version: 3.1.0 resolution: "p-limit@npm:3.1.0" @@ -22406,6 +23098,13 @@ __metadata: languageName: node linkType: hard +"p-map@npm:^2.0.0": + version: 2.1.0 + resolution: "p-map@npm:2.1.0" + checksum: 10/9e3ad3c9f6d75a5b5661bcad78c91f3a63849189737cd75e4f1225bf9ac205194e5c44aac2ef6f09562b1facdb9bd1425584d7ac375bfaa17b3f1a142dab936d + languageName: node + linkType: hard + "p-map@npm:^4.0.0": version: 4.0.0 resolution: "p-map@npm:4.0.0" @@ -22475,6 +23174,15 @@ __metadata: languageName: node linkType: hard +"package-manager-detector@npm:^0.2.0": + version: 0.2.11 + resolution: "package-manager-detector@npm:0.2.11" + dependencies: + quansync: "npm:^0.2.7" + checksum: 10/2c1a8da0e5895f0be06a8e1f4b4336fb78a19167ca3932dbaeca7260f948e67cf53b32585a13f8108341e7a468b38b4f2a8afc7b11691cb2d856ecd759d570fb + languageName: node + linkType: hard + "pako@npm:~1.0.5": version: 1.0.11 resolution: "pako@npm:1.0.11" @@ -22586,6 +23294,30 @@ __metadata: languageName: node linkType: hard +"patch-package@npm:^6.4.7": + version: 6.5.1 + resolution: "patch-package@npm:6.5.1" + dependencies: + "@yarnpkg/lockfile": "npm:^1.1.0" + chalk: "npm:^4.1.2" + cross-spawn: "npm:^6.0.5" + find-yarn-workspace-root: "npm:^2.0.0" + fs-extra: "npm:^9.0.0" + is-ci: "npm:^2.0.0" + klaw-sync: "npm:^6.0.0" + minimist: "npm:^1.2.6" + open: "npm:^7.4.2" + rimraf: "npm:^2.6.3" + semver: "npm:^5.6.0" + slash: "npm:^2.0.0" + tmp: "npm:^0.0.33" + yaml: "npm:^1.10.2" + bin: + patch-package: index.js + checksum: 10/e15b3848f008da2cc659abd6d84dfeab6ed25a999ba25692071c13409f198dad28b6e451ecfebc2139a0847ad8e608575d6724bcc887c56169df8a733b849e79 + languageName: node + linkType: hard + "path-browserify@npm:^1.0.1": version: 1.0.1 resolution: "path-browserify@npm:1.0.1" @@ -22631,6 +23363,13 @@ __metadata: languageName: node linkType: hard +"path-key@npm:^2.0.1": + version: 2.0.1 + resolution: "path-key@npm:2.0.1" + checksum: 10/6e654864e34386a2a8e6bf72cf664dcabb76574dd54013add770b374384d438aca95f4357bb26935b514a4e4c2c9b19e191f2200b282422a76ee038b9258c5e7 + languageName: node + linkType: hard + "path-key@npm:^3.0.0, path-key@npm:^3.1.0": version: 3.1.1 resolution: "path-key@npm:3.1.1" @@ -23940,7 +24679,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^1.18.2 || ^2.0.0, prettier@npm:^2.3.1, prettier@npm:^2.8.3, prettier@npm:^2.8.8": +"prettier@npm:^1.18.2 || ^2.0.0, prettier@npm:^2.3.1, prettier@npm:^2.7.1, prettier@npm:^2.8.3, prettier@npm:^2.8.8": version: 2.8.8 resolution: "prettier@npm:2.8.8" bin: @@ -24089,6 +24828,17 @@ __metadata: languageName: node linkType: hard +"proper-lockfile@npm:^4.1.1": + version: 4.1.2 + resolution: "proper-lockfile@npm:4.1.2" + dependencies: + graceful-fs: "npm:^4.2.4" + retry: "npm:^0.12.0" + signal-exit: "npm:^3.0.2" + checksum: 10/000a4875f543f591872b36ca94531af8a6463ddb0174f41c0b004d19e231d7445268b422ff1ea595e43d238655c702250cd3d27f408e7b9d97b56f1533ba26bf + languageName: node + linkType: hard + "property-information@npm:^6.0.0": version: 6.4.0 resolution: "property-information@npm:6.4.0" @@ -24270,6 +25020,13 @@ __metadata: languageName: node linkType: hard +"quansync@npm:^0.2.7": + version: 0.2.10 + resolution: "quansync@npm:0.2.10" + checksum: 10/b54d955de867e104025f2666d52b2b67befe4e0f184a96acc9adcbdc572e46dce49c69d1e79f99413beae8a974a576383806a05f85f9a826865dc589ee1bcaf2 + languageName: node + linkType: hard + "query-string@npm:7.1.3": version: 7.1.3 resolution: "query-string@npm:7.1.3" @@ -24943,6 +25700,18 @@ __metadata: languageName: node linkType: hard +"read-yaml-file@npm:^1.1.0": + version: 1.1.0 + resolution: "read-yaml-file@npm:1.1.0" + dependencies: + graceful-fs: "npm:^4.1.5" + js-yaml: "npm:^3.6.1" + pify: "npm:^4.0.1" + strip-bom: "npm:^3.0.0" + checksum: 10/41ee5f075507ef0403328dd54e225a61c3149f915675ce7fd0fd791ddcce2e6c30a9fe0f76ffa7a465c1c157b9b4ad8ded1dcf47dc3b396103eeb013490bbc2e + languageName: node + linkType: hard + "readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0, readable-stream@npm:^3.6.2": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -25972,7 +26741,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -26227,6 +26996,15 @@ __metadata: languageName: node linkType: hard +"shebang-command@npm:^1.2.0": + version: 1.2.0 + resolution: "shebang-command@npm:1.2.0" + dependencies: + shebang-regex: "npm:^1.0.0" + checksum: 10/9eed1750301e622961ba5d588af2212505e96770ec376a37ab678f965795e995ade7ed44910f5d3d3cb5e10165a1847f52d3348c64e146b8be922f7707958908 + languageName: node + linkType: hard + "shebang-command@npm:^2.0.0": version: 2.0.0 resolution: "shebang-command@npm:2.0.0" @@ -26236,6 +27014,13 @@ __metadata: languageName: node linkType: hard +"shebang-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "shebang-regex@npm:1.0.0" + checksum: 10/404c5a752cd40f94591dfd9346da40a735a05139dac890ffc229afba610854d8799aaa52f87f7e0c94c5007f2c6af55bdcaeb584b56691926c5eaf41dc8f1372 + languageName: node + linkType: hard + "shebang-regex@npm:^3.0.0": version: 3.0.0 resolution: "shebang-regex@npm:3.0.0" @@ -26359,6 +27144,13 @@ __metadata: languageName: node linkType: hard +"slash@npm:^2.0.0": + version: 2.0.0 + resolution: "slash@npm:2.0.0" + checksum: 10/512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6 + languageName: node + linkType: hard + "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -26543,6 +27335,13 @@ __metadata: languageName: node linkType: hard +"solidity-ast@npm:^0.4.51": + version: 0.4.60 + resolution: "solidity-ast@npm:0.4.60" + checksum: 10/1811d4f5c3b767875819127a9eed125700840124d4d958a09f77cca33f224b4d075567344e366d12569fc6a1974798a30359fb817abf7cbaf320fbd7891e95bd + languageName: node + linkType: hard + "solidity-coverage@npm:^0.8.14": version: 0.8.14 resolution: "solidity-coverage@npm:0.8.14" @@ -26696,6 +27495,16 @@ __metadata: languageName: node linkType: hard +"spawndamnit@npm:^3.0.1": + version: 3.0.1 + resolution: "spawndamnit@npm:3.0.1" + dependencies: + cross-spawn: "npm:^7.0.5" + signal-exit: "npm:^4.0.1" + checksum: 10/47d88a7f1e5691e13e435eddc3d34123c2f7746e2853e91bfac5ea7c6e3bb4b1d1995223b25f7a8745871510d92f63ecd3c9fa02aa2896ac0c79fb618eb08bbe + languageName: node + linkType: hard + "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" @@ -27610,6 +28419,13 @@ __metadata: languageName: node linkType: hard +"term-size@npm:^2.1.0": + version: 2.2.1 + resolution: "term-size@npm:2.2.1" + checksum: 10/f96aca2d4139c91e3359f5949ffb86f0a58f8c254ab7fe4a64b65126974939c782db6aaa91bf51a56d0344e505e22f9a0186f2f689e23ac9382b54606603c537 + languageName: node + linkType: hard + "terminal-link@npm:^2.0.0": version: 2.1.1 resolution: "terminal-link@npm:2.1.1" @@ -29163,9 +29979,9 @@ __metadata: languageName: node linkType: hard -"viem@npm:^2.21.35": - version: 2.23.2 - resolution: "viem@npm:2.23.2" +"viem@npm:^2.24.1": + version: 2.26.3 + resolution: "viem@npm:2.26.3" dependencies: "@noble/curves": "npm:1.8.1" "@noble/hashes": "npm:1.7.1" @@ -29173,14 +29989,14 @@ __metadata: "@scure/bip39": "npm:1.5.4" abitype: "npm:1.0.8" isows: "npm:1.0.6" - ox: "npm:0.6.7" - ws: "npm:8.18.0" + ox: "npm:0.6.9" + ws: "npm:8.18.1" peerDependencies: typescript: ">=5.0.4" peerDependenciesMeta: typescript: optional: true - checksum: 10/847fdb57a6941f67c4ff97c79d99368c48e78b9c070df8fb3f3310d58bbd075fd78e9a506abccb82fcdbcf0c6c13aba7cfb021e37fda0777ea1eb0ccecf25fe1 + checksum: 10/20ec6f998c225f5af29930b90ad3a62a6057b522ad834954e4ba687713d643bf5252af74bed1f26ae12a737e7261fb9b5f6a89058c6747a66917991a2b6636d6 languageName: node linkType: hard @@ -29912,7 +30728,7 @@ __metadata: languageName: node linkType: hard -"which@npm:^1.1.1, which@npm:^1.3.1": +"which@npm:^1.1.1, which@npm:^1.2.9, which@npm:^1.3.1": version: 1.3.1 resolution: "which@npm:1.3.1" dependencies: @@ -30300,6 +31116,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:8.18.1": + version: 8.18.1 + resolution: "ws@npm:8.18.1" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 10/3f38e9594f2af5b6324138e86b74df7d77bbb8e310bf8188679dd80bac0d1f47e51536a1923ac3365f31f3d8b25ea0b03e4ade466aa8292a86cd5defca64b19b + languageName: node + linkType: hard + "ws@npm:^7.4.6, ws@npm:^7.5.1": version: 7.5.9 resolution: "ws@npm:7.5.9" From a4a8f249b85fe1c49631407e639c46b5e7fc30ab Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Thu, 17 Apr 2025 20:26:41 +0100 Subject: [PATCH 04/10] chore: bumped @kleros/kleros-v2-contracts, bumped hardhat/viem/wagmi --- contracts/deploy/00-escrow.ts | 4 +- contracts/deploy/utils/getContracts.ts | 58 +- contracts/hardhat.config.ts | 11 - contracts/package.json | 22 +- subgraph/package.json | 2 +- web/package.json | 7 +- yarn.lock | 913 ++++++++++++------------- 7 files changed, 468 insertions(+), 549 deletions(-) diff --git a/contracts/deploy/00-escrow.ts b/contracts/deploy/00-escrow.ts index 4d214860..f5e741e9 100644 --- a/contracts/deploy/00-escrow.ts +++ b/contracts/deploy/00-escrow.ts @@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types"; import { DeployFunction } from "hardhat-deploy/types"; import { HomeChains, isSkipped } from "./utils"; import { EscrowUniversal } from "../typechain-types"; -import { getContracts } from "./utils/getContracts"; +import { getArbitratorContracts } from "./utils/getContracts"; const config = { arbitrumSepoliaDevnet: { @@ -28,7 +28,7 @@ const deploy: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { const chainId = Number(await getChainId()); console.log("deploying to %s with deployer %s", HomeChains[chainId], deployer); - const { disputeTemplateRegistry, klerosCore } = await getContracts(hre); + const { disputeTemplateRegistry, klerosCore } = await getArbitratorContracts(hre); const { feeTimeout, settlementTimeout, jurors, courtId } = config[network.name]; const extraData = ethers.AbiCoder.defaultAbiCoder().encode(["uint96", "uint96"], [courtId, jurors]); diff --git a/contracts/deploy/utils/getContracts.ts b/contracts/deploy/utils/getContracts.ts index 121dbeec..1de5078f 100644 --- a/contracts/deploy/utils/getContracts.ts +++ b/contracts/deploy/utils/getContracts.ts @@ -1,46 +1,28 @@ import { HardhatRuntimeEnvironment } from "hardhat/types"; -import { - disputeTemplateRegistryConfig as devnetDtrConfig, - klerosCoreConfig as devnetCoreConfig, -} from "@kleros/kleros-v2-contracts/deployments/devnet.viem"; -import { - disputeTemplateRegistryConfig as mainnetDtrConfig, - klerosCoreNeoConfig as mainnetCoreConfig, -} from "@kleros/kleros-v2-contracts/deployments/mainnet.viem"; -import { - KlerosCore, - DisputeTemplateRegistry__factory, - KlerosCore__factory, - KlerosCoreNeo__factory, - KlerosCoreNeo, - DisputeTemplateRegistry, -} from "@kleros/kleros-v2-contracts/typechain-types"; +import { DeploymentName, getContractsEthers as _getArbitratorContracts } from "@kleros/kleros-v2-contracts"; import { EscrowView, EscrowUniversal } from "../../typechain-types"; +const NETWORK_TO_DEPLOYMENT: Record = { + arbitrumSepoliaDevnet: "devnet", + arbitrumSepolia: "testnet", + arbitrum: "mainnetNeo", +} as const; + +export const getArbitratorContracts = async (hre: HardhatRuntimeEnvironment) => { + const { ethers, deployments } = hre; + const networkName = deployments.getNetworkName(); + const deploymentName = NETWORK_TO_DEPLOYMENT[networkName]; + if (!deploymentName) + throw new Error( + `Unsupported network: ${networkName}. Supported networks: ${Object.keys(NETWORK_TO_DEPLOYMENT).join(", ")}` + ); + return await _getArbitratorContracts(ethers.provider, deploymentName); +}; + export const getContracts = async (hre: HardhatRuntimeEnvironment) => { - const { getChainId, ethers, config } = hre; - const chainId = Number(await getChainId()); + const { ethers } = hre; + const { klerosCore, disputeTemplateRegistry } = await getArbitratorContracts(hre); const escrow = await ethers.getContract("EscrowUniversal"); const view = await ethers.getContract("EscrowView"); - let disputeTemplateRegistry: DisputeTemplateRegistry; - let klerosCore: KlerosCore | KlerosCoreNeo; - switch (chainId) { - case config.networks.arbitrum.chainId: - disputeTemplateRegistry = DisputeTemplateRegistry__factory.connect( - mainnetDtrConfig.address[chainId], - ethers.provider - ); - klerosCore = KlerosCoreNeo__factory.connect(mainnetCoreConfig.address[chainId], ethers.provider); - break; - case config.networks.arbitrumSepolia.chainId: - disputeTemplateRegistry = DisputeTemplateRegistry__factory.connect( - devnetDtrConfig.address[chainId], - ethers.provider - ); - klerosCore = KlerosCore__factory.connect(devnetCoreConfig.address[chainId], ethers.provider); - break; - default: - throw new Error(`Unsupported chainId: ${chainId}`); - } return { escrow, view, disputeTemplateRegistry, klerosCore }; }; diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index 930e2af1..40106693 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -187,17 +187,6 @@ const config: HardhatUserConfig = { mocha: { timeout: 20000, }, - external: { - // https://github.com/wighawag/hardhat-deploy#importing-deployment-from-other-projects-with-truffle-support - deployments: { - localhost: process.env.HARDHAT_FORK - ? ["../node_modules/@kleros/kleros-v2-contracts/deployments/" + process.env.HARDHAT_FORK] - : [], - arbitrumSepoliaDevnet: ["../node_modules/@kleros/kleros-v2-contracts/deployments/arbitrumSepoliaDevnet"], - arbitrumSepolia: ["../node_modules/@kleros/kleros-v2-contracts/deployments/arbitrumSepolia"], - arbitrum: ["../node_modules/@kleros/kleros-v2-contracts/deployments/arbitrum"], - }, - }, }; export default config; diff --git a/contracts/package.json b/contracts/package.json index 325c6019..d3ab0dda 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -58,22 +58,22 @@ "@nomiclabs/hardhat-solhint": "^4.0.1", "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^9.1.0", - "@types/chai": "^4.3.20", + "@types/chai": "^5.2.1", "@types/mocha": "^10.0.10", - "@types/node": "^18.0.0", - "@wagmi/cli": "^2.0.3", - "abitype": "^0.10.3", - "chai": "^4.5.0", + "@types/node": "^18.19.86", + "@wagmi/cli": "^2.2.1", + "abitype": "^1.0.8", + "chai": "^5.2.0", "dotenv": "^16.4.5", "ethereumjs-util": "^7.1.5", - "ethers": "^6.13.5", + "ethers": "^6.13.6", "graphql": "^16.10.0", "graphql-request": "^6.1.0", - "hardhat": "2.22.18", - "hardhat-deploy": "^0.14.0", + "hardhat": "2.23.0", + "hardhat-deploy": "^1.0.2", "hardhat-deploy-ethers": "^0.4.2", "hardhat-docgen": "^1.3.0", - "hardhat-gas-reporter": "^2.2.2", + "hardhat-gas-reporter": "^2.2.3", "hardhat-watcher": "^2.5.0", "pino": "^8.17.0", "pino-pretty": "^10.2.3", @@ -83,7 +83,7 @@ "typescript": "^5.7.3" }, "dependencies": { - "@kleros/kleros-v2-contracts": "^0.8.1", - "@openzeppelin/contracts": "^5.2.0" + "@kleros/kleros-v2-contracts": "^0.9.2", + "@openzeppelin/contracts": "^5.3.0" } } diff --git a/subgraph/package.json b/subgraph/package.json index e24b729c..8d238a51 100644 --- a/subgraph/package.json +++ b/subgraph/package.json @@ -30,7 +30,7 @@ "@graphprotocol/graph-cli": "0.95.0", "@kleros/escrow-v2-eslint-config": "workspace:^", "@kleros/escrow-v2-prettier-config": "workspace:^", - "gluegun": "^5.1.2", + "gluegun": "^5.2.0", "matchstick-as": "0.6.0" }, "dependenciesComments": { diff --git a/web/package.json b/web/package.json index 84dc126c..fa6a007d 100644 --- a/web/package.json +++ b/web/package.json @@ -52,7 +52,7 @@ "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "@typescript-eslint/utils": "^5.62.0", - "@wagmi/cli": "^2.1.15", + "@wagmi/cli": "^2.2.1", "eslint": "^8.56.0", "eslint-config-prettier": "^8.10.0", "eslint-plugin-react": "^7.33.2", @@ -78,7 +78,6 @@ "chart.js": "^3.9.1", "chartjs-adapter-moment": "^1.0.1", "core-js": "^3.35.0", - "ethers": "^5.7.2", "graphql": "^16.9.0", "graphql-request": "^7.1.2", "moment": "^2.30.1", @@ -99,7 +98,7 @@ "react-use": "^17.4.3", "styled-components": "^5.3.11", "subgraph-status": "^1.2.4", - "viem": "^2.22.22", - "wagmi": "^2.14.10" + "viem": "^2.27.2", + "wagmi": "^2.14.16" } } diff --git a/yarn.lock b/yarn.lock index 13054cd9..9de06e72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3164,6 +3164,15 @@ __metadata: languageName: node linkType: hard +"@ethereumjs/rlp@npm:^5.0.2": + version: 5.0.2 + resolution: "@ethereumjs/rlp@npm:5.0.2" + bin: + rlp: bin/rlp.cjs + checksum: 10/2af80d98faf7f64dfb6d739c2df7da7350ff5ad52426c3219897e843ee441215db0ffa346873200a6be6d11142edb9536e66acd62436b5005fa935baaf7eb6bd + languageName: node + linkType: hard + "@ethereumjs/tx@npm:^4.1.2, @ethereumjs/tx@npm:^4.2.0": version: 4.2.0 resolution: "@ethereumjs/tx@npm:4.2.0" @@ -3187,6 +3196,16 @@ __metadata: languageName: node linkType: hard +"@ethereumjs/util@npm:^9.1.0": + version: 9.1.0 + resolution: "@ethereumjs/util@npm:9.1.0" + dependencies: + "@ethereumjs/rlp": "npm:^5.0.2" + ethereum-cryptography: "npm:^2.2.1" + checksum: 10/4e22c4081c63eebb808eccd54f7f91cd3407f4cac192da5f30a0d6983fe07d51f25e6a9d08624f1376e604bb7dce574aafcf0fbf0becf42f62687c11e710ac41 + languageName: node + linkType: hard + "@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.9, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/abi@npm:5.7.0" @@ -4937,30 +4956,30 @@ __metadata: "@kleros/escrow-v2-eslint-config": "workspace:^" "@kleros/escrow-v2-prettier-config": "workspace:^" "@kleros/escrow-v2-tsconfig": "workspace:^" - "@kleros/kleros-v2-contracts": "npm:^0.8.1" + "@kleros/kleros-v2-contracts": "npm:^0.9.2" "@logtail/pino": "npm:^0.4.0" "@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.8" "@nomicfoundation/hardhat-ethers": "npm:^3.0.8" "@nomiclabs/hardhat-solhint": "npm:^4.0.1" - "@openzeppelin/contracts": "npm:^5.2.0" + "@openzeppelin/contracts": "npm:^5.3.0" "@typechain/ethers-v6": "npm:^0.5.1" "@typechain/hardhat": "npm:^9.1.0" - "@types/chai": "npm:^4.3.20" + "@types/chai": "npm:^5.2.1" "@types/mocha": "npm:^10.0.10" - "@types/node": "npm:^18.0.0" - "@wagmi/cli": "npm:^2.0.3" - abitype: "npm:^0.10.3" - chai: "npm:^4.5.0" + "@types/node": "npm:^18.19.86" + "@wagmi/cli": "npm:^2.2.1" + abitype: "npm:^1.0.8" + chai: "npm:^5.2.0" dotenv: "npm:^16.4.5" ethereumjs-util: "npm:^7.1.5" - ethers: "npm:^6.13.5" + ethers: "npm:^6.13.6" graphql: "npm:^16.10.0" graphql-request: "npm:^6.1.0" - hardhat: "npm:2.22.18" - hardhat-deploy: "npm:^0.14.0" + hardhat: "npm:2.23.0" + hardhat-deploy: "npm:^1.0.2" hardhat-deploy-ethers: "npm:^0.4.2" hardhat-docgen: "npm:^1.3.0" - hardhat-gas-reporter: "npm:^2.2.2" + hardhat-gas-reporter: "npm:^2.2.3" hardhat-watcher: "npm:^2.5.0" pino: "npm:^8.17.0" pino-pretty: "npm:^10.2.3" @@ -5010,7 +5029,7 @@ __metadata: "@graphprotocol/graph-ts": "npm:^0.37.0" "@kleros/escrow-v2-eslint-config": "workspace:^" "@kleros/escrow-v2-prettier-config": "workspace:^" - gluegun: "npm:^5.1.2" + gluegun: "npm:^5.2.0" matchstick-as: "npm:0.6.0" languageName: unknown linkType: soft @@ -5044,7 +5063,7 @@ __metadata: "@typescript-eslint/eslint-plugin": "npm:^5.62.0" "@typescript-eslint/parser": "npm:^5.62.0" "@typescript-eslint/utils": "npm:^5.62.0" - "@wagmi/cli": "npm:^2.1.15" + "@wagmi/cli": "npm:^2.2.1" "@yornaath/batshit": "npm:^0.9.0" alchemy-sdk: "npm:^3.3.1" chart.js: "npm:^3.9.1" @@ -5054,7 +5073,6 @@ __metadata: eslint-config-prettier: "npm:^8.10.0" eslint-plugin-react: "npm:^7.33.2" eslint-plugin-react-hooks: "npm:^4.6.0" - ethers: "npm:^5.7.2" graphql: "npm:^16.9.0" graphql-request: "npm:^7.1.2" lru-cache: "npm:^7.18.3" @@ -5077,12 +5095,12 @@ __metadata: styled-components: "npm:^5.3.11" subgraph-status: "npm:^1.2.4" typescript: "npm:^5.7.3" - viem: "npm:^2.22.22" + viem: "npm:^2.27.2" vite: "npm:^5.4.2" vite-plugin-node-polyfills: "npm:^0.21.0" vite-plugin-svgr: "npm:^4.2.0" vite-tsconfig-paths: "npm:^4.3.2" - wagmi: "npm:^2.14.10" + wagmi: "npm:^2.14.16" languageName: unknown linkType: soft @@ -5103,15 +5121,15 @@ __metadata: languageName: node linkType: hard -"@kleros/kleros-v2-contracts@npm:^0.8.1": - version: 0.8.1 - resolution: "@kleros/kleros-v2-contracts@npm:0.8.1" +"@kleros/kleros-v2-contracts@npm:^0.9.2": + version: 0.9.2 + resolution: "@kleros/kleros-v2-contracts@npm:0.9.2" dependencies: "@chainlink/contracts": "npm:^1.3.0" "@kleros/vea-contracts": "npm:^0.6.0" "@openzeppelin/contracts": "npm:^5.2.0" viem: "npm:^2.24.1" - checksum: 10/11dc365d94450adc13b5dd3ff4e9c64b496808466304d4ac88deed98f5582bdd06c3f908bd8eaaaf6cacd99179d1367f9768eb6873354c74e8b548055586bdc2 + checksum: 10/8774811f7f49a25739e679ca7dc4fb10d86b635406473488f912d1445ed95107d46995b979882e8acdb762faad037c17b305007997cf70158aa6f95ae79bdd00 languageName: node linkType: hard @@ -5353,19 +5371,6 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-sig-util@npm:^4.0.0": - version: 4.0.1 - resolution: "@metamask/eth-sig-util@npm:4.0.1" - dependencies: - ethereumjs-abi: "npm:^0.6.8" - ethereumjs-util: "npm:^6.2.1" - ethjs-util: "npm:^0.1.6" - tweetnacl: "npm:^1.0.3" - tweetnacl-util: "npm:^0.15.1" - checksum: 10/a41a986abd14675badeb02041466e30e1c3ef529c1d131f47c27fd48d73144fcf590f45d8ee8b7cd357725ebf75ece93f4484adf1baf6311cc996f7ef82c4ae1 - languageName: node - linkType: hard - "@metamask/json-rpc-engine@npm:^7.0.0": version: 7.3.1 resolution: "@metamask/json-rpc-engine@npm:7.3.1" @@ -5767,7 +5772,7 @@ __metadata: languageName: node linkType: hard -"@noble/curves@npm:1.2.0, @noble/curves@npm:~1.2.0": +"@noble/curves@npm:1.2.0": version: 1.2.0 resolution: "@noble/curves@npm:1.2.0" dependencies: @@ -5870,7 +5875,7 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.1, @noble/hashes@npm:~1.3.2": +"@noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.1": version: 1.3.3 resolution: "@noble/hashes@npm:1.3.3" checksum: 10/1025ddde4d24630e95c0818e63d2d54ee131b980fe113312d17ed7468bc18f54486ac86c907685759f8a7e13c2f9b9e83ec7b67d1cc20836f36b5e4a65bb102d @@ -5918,117 +5923,67 @@ __metadata: languageName: node linkType: hard -"@nomicfoundation/edr-darwin-arm64@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-darwin-arm64@npm:0.7.0" - checksum: 10/be9ff1c9ece6875486c3eabd9cdddd90bbdbed9cecc376efc9aec0c7ce54fcb83b33adf4bab26fa134867a538cc26137c027c2aa2b7adf242ef0ef07fe240c56 - languageName: node - linkType: hard - -"@nomicfoundation/edr-darwin-x64@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-darwin-x64@npm:0.7.0" - checksum: 10/5e89e2c51f470e0a88f089098c8771b55466c082b7d84148b114541f81ff182bab3383623170bf329a78ea6274571993fea20ebfe080f898e775f3457eda358f - languageName: node - linkType: hard - -"@nomicfoundation/edr-linux-arm64-gnu@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-linux-arm64-gnu@npm:0.7.0" - checksum: 10/7d77d116bc1b668ec83437795ae17150e70edfad700bd7335f7e7d072731649024c28cc7aca5799480cfef42b7ae52b3e1522051a04ce4f8924c716714176277 - languageName: node - linkType: hard - -"@nomicfoundation/edr-linux-arm64-musl@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-linux-arm64-musl@npm:0.7.0" - checksum: 10/de5c8a2a713eb9a6792a79c8b8ebb6f8de38018ab5bfc6bb35cd435a89c62e77bab550e334eadda9493b4134481d39f11208e3b480b86a0b4b703c0b3d05561a - languageName: node - linkType: hard - -"@nomicfoundation/edr-linux-x64-gnu@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-linux-x64-gnu@npm:0.7.0" - checksum: 10/33077f290bbb1e8ce178d50289bb6591c72a18b35b5f31e3e4051a9af6ec10312b21d47ed2d4938a6f64ee5b3e2413c3390fa0f4f5da5fb73dda7eb1c86bc742 +"@nomicfoundation/edr-darwin-arm64@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-darwin-arm64@npm:0.10.0" + checksum: 10/437b330d4400198da7e2412a5ce0cf213e6dbe1e944be0a38a8835869e0fab4b38a03a5a650880853605f7bccb0f3cae1de00ee99f114f1d49f5450a7b6edd3e languageName: node linkType: hard -"@nomicfoundation/edr-linux-x64-musl@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-linux-x64-musl@npm:0.7.0" - checksum: 10/48784d44e3dd8a7a0d52a0f3f7511f02e5d1d94678a1baa29bf5a1c0973a707c96e09835622b5483ed3698622abd34bf4338ed9f688f01cb8ce55edddf78cdb4 +"@nomicfoundation/edr-darwin-x64@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-darwin-x64@npm:0.10.0" + checksum: 10/bd81a4ca11fabc54401d2780d3a63a6ca6891863ccefaa23cb4fad36a79e038748b27db0634f811b625cb4fae4458d2a4d0bb40b48c84886058d8b844690ec9e languageName: node linkType: hard -"@nomicfoundation/edr-win32-x64-msvc@npm:0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr-win32-x64-msvc@npm:0.7.0" - checksum: 10/517897959478810d168f95274762f1565185026a8a908d289120f97344be33865104c2a07eb7277d5ea992f5db55790f63efe460fea61d1c2ed7879567828f15 +"@nomicfoundation/edr-linux-arm64-gnu@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-linux-arm64-gnu@npm:0.10.0" + checksum: 10/c2bb05ac8f572ebd0025ed3fb2afd5a9cd8300f5f39fd13fccd4b26841de2582358cd627d253d85810b51af30a20e317d433723da9a158c894332f87367c65c8 languageName: node linkType: hard -"@nomicfoundation/edr@npm:^0.7.0": - version: 0.7.0 - resolution: "@nomicfoundation/edr@npm:0.7.0" - dependencies: - "@nomicfoundation/edr-darwin-arm64": "npm:0.7.0" - "@nomicfoundation/edr-darwin-x64": "npm:0.7.0" - "@nomicfoundation/edr-linux-arm64-gnu": "npm:0.7.0" - "@nomicfoundation/edr-linux-arm64-musl": "npm:0.7.0" - "@nomicfoundation/edr-linux-x64-gnu": "npm:0.7.0" - "@nomicfoundation/edr-linux-x64-musl": "npm:0.7.0" - "@nomicfoundation/edr-win32-x64-msvc": "npm:0.7.0" - checksum: 10/b5c9546152574642b6d401b8da7f2a01cb98edd0da25aa2e7c16434e44b4134c699b50e8415449543701e3b722f5d6c8d8e4d8f699df3f7ebdb4acb907f0a794 +"@nomicfoundation/edr-linux-arm64-musl@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-linux-arm64-musl@npm:0.10.0" + checksum: 10/aa9437077537fa7feb79c3e739a41d69b896868d729d64078e4d56d67d1e39424697c4ee27fbe1668d019c821b94dbce2345db324a9c4a9c3809f2d6c7eccf96 languageName: node linkType: hard -"@nomicfoundation/ethereumjs-common@npm:4.0.4": - version: 4.0.4 - resolution: "@nomicfoundation/ethereumjs-common@npm:4.0.4" - dependencies: - "@nomicfoundation/ethereumjs-util": "npm:9.0.4" - checksum: 10/1daaede087c5dee92cb1e5309a548da2d64484722b917eccda4118d627293b61f705a990075f4d7f0f350100ed79396b3a25e7ea67824242d36d23716fe75e97 +"@nomicfoundation/edr-linux-x64-gnu@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-linux-x64-gnu@npm:0.10.0" + checksum: 10/4b4eaa16d4f55cb363fbecec9ce6d0412311af7959a20ef68f5a189977a6f7953c9b4b9d596da25f42bf1aea6997ed0175cdc376569934d2fd4b4fd677843cd2 languageName: node linkType: hard -"@nomicfoundation/ethereumjs-rlp@npm:5.0.4": - version: 5.0.4 - resolution: "@nomicfoundation/ethereumjs-rlp@npm:5.0.4" - bin: - rlp: bin/rlp.cjs - checksum: 10/39fb26340bb2643a66c642315aa7b6fcfbdbddddeee18b4b683b77aa93b8a031bc86d4d4144368e5dd20499dc96b8b27751c6a285ff34e7a9969b530b306ce8c +"@nomicfoundation/edr-linux-x64-musl@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-linux-x64-musl@npm:0.10.0" + checksum: 10/9006aaf0d8979e86e5eb055416ecd76b6e2e3783712152ee62d1e32ef78c68e0e1472956aa9afb08bac33e7d831e524aa86ba65737fbaeafac020c81af56836e languageName: node linkType: hard -"@nomicfoundation/ethereumjs-tx@npm:5.0.4": - version: 5.0.4 - resolution: "@nomicfoundation/ethereumjs-tx@npm:5.0.4" - dependencies: - "@nomicfoundation/ethereumjs-common": "npm:4.0.4" - "@nomicfoundation/ethereumjs-rlp": "npm:5.0.4" - "@nomicfoundation/ethereumjs-util": "npm:9.0.4" - ethereum-cryptography: "npm:0.1.3" - peerDependencies: - c-kzg: ^2.1.2 - peerDependenciesMeta: - c-kzg: - optional: true - checksum: 10/5e84de14fa464501c5c60ac6519f536d39ebc52c4d1fb79c63a66ea86f992bde4f338b0b0fdd2e5bc811ebd984e8ff41e4205e47d30001bad5b45370568bc41c +"@nomicfoundation/edr-win32-x64-msvc@npm:0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr-win32-x64-msvc@npm:0.10.0" + checksum: 10/8c809725f1023c7f9709df0abf3b34e00ab234ffac43a81420543a420ecb644a5e0f6d5f16124c24e69916074660decdb4af8ec423b2ea69335968787778b8f2 languageName: node linkType: hard -"@nomicfoundation/ethereumjs-util@npm:9.0.4": - version: 9.0.4 - resolution: "@nomicfoundation/ethereumjs-util@npm:9.0.4" +"@nomicfoundation/edr@npm:^0.10.0": + version: 0.10.0 + resolution: "@nomicfoundation/edr@npm:0.10.0" dependencies: - "@nomicfoundation/ethereumjs-rlp": "npm:5.0.4" - ethereum-cryptography: "npm:0.1.3" - peerDependencies: - c-kzg: ^2.1.2 - peerDependenciesMeta: - c-kzg: - optional: true - checksum: 10/891806c7edda29c7b3f61551949ff0c1fa5f4e122fba84878bf27362a9e058768fd01194dc0e031de2e523c30ecbeb22e6841b8ab3772c8567fef4af6480872d + "@nomicfoundation/edr-darwin-arm64": "npm:0.10.0" + "@nomicfoundation/edr-darwin-x64": "npm:0.10.0" + "@nomicfoundation/edr-linux-arm64-gnu": "npm:0.10.0" + "@nomicfoundation/edr-linux-arm64-musl": "npm:0.10.0" + "@nomicfoundation/edr-linux-x64-gnu": "npm:0.10.0" + "@nomicfoundation/edr-linux-x64-musl": "npm:0.10.0" + "@nomicfoundation/edr-win32-x64-msvc": "npm:0.10.0" + checksum: 10/123405a84cba348ea4381d75f06a68e9caadd4e5615e706d35f2c2e9e399846067c8cc41e1f52ecd7fc31538fb81a8e20e5dee5196fc38d7b79b75006edb73c1 languageName: node linkType: hard @@ -6376,6 +6331,13 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/contracts@npm:^5.3.0": + version: 5.3.0 + resolution: "@openzeppelin/contracts@npm:5.3.0" + checksum: 10/d1b379a56eb443b6ba2caee51f38bd3e2d5be2d3b2c935a083ed3311c106aa3903d7cadd05457999b24175bb80cc405dd6c70297c9825b15471b38051021fd88 + languageName: node + linkType: hard + "@openzeppelin/upgrades-core@npm:^1.24.1": version: 1.42.2 resolution: "@openzeppelin/upgrades-core@npm:1.42.2" @@ -7211,13 +7173,6 @@ __metadata: languageName: node linkType: hard -"@scure/base@npm:~1.1.2": - version: 1.1.9 - resolution: "@scure/base@npm:1.1.9" - checksum: 10/f0ab7f687bbcdee2a01377fe3cd808bf63977999672751295b6a92625d5322f4754a96d40f6bd579bc367aad48ecf8a4e6d0390e70296e6ded1076f52adb16bb - languageName: node - linkType: hard - "@scure/base@npm:~1.1.6": version: 1.1.7 resolution: "@scure/base@npm:1.1.7" @@ -7261,17 +7216,6 @@ __metadata: languageName: node linkType: hard -"@scure/bip32@npm:1.3.2": - version: 1.3.2 - resolution: "@scure/bip32@npm:1.3.2" - dependencies: - "@noble/curves": "npm:~1.2.0" - "@noble/hashes": "npm:~1.3.2" - "@scure/base": "npm:~1.1.2" - checksum: 10/b90da28dfe75519496a85c97e77c9443734873910f32b8557762910a5c4e642290a462b0ed14fa42e0efed6acb9a7f6155ad5cb5d38d4ff87eb2de4760eb32a4 - languageName: node - linkType: hard - "@scure/bip32@npm:1.4.0": version: 1.4.0 resolution: "@scure/bip32@npm:1.4.0" @@ -8180,15 +8124,6 @@ __metadata: languageName: node linkType: hard -"@types/bn.js@npm:^4.11.3": - version: 4.11.6 - resolution: "@types/bn.js@npm:4.11.6" - dependencies: - "@types/node": "npm:*" - checksum: 10/9ff3e7a1539a953c381c0d30ea2049162e3cab894cda91ee10f3a84d603f9afa2b2bc2a38fe9b427de94b6e2b7b77aefd217c1c7b07a10ae8d7499f9d6697a41 - languageName: node - linkType: hard - "@types/bn.js@npm:^5.1.0": version: 5.1.5 resolution: "@types/bn.js@npm:5.1.5" @@ -8233,10 +8168,12 @@ __metadata: languageName: node linkType: hard -"@types/chai@npm:^4.3.20": - version: 4.3.20 - resolution: "@types/chai@npm:4.3.20" - checksum: 10/94fd87036fb63f62c79caf58ccaec88e23cc109e4d41607d83adc609acd6b24eabc345feb7850095a53f76f99c470888251da9bd1b90849c8b2b5a813296bb19 +"@types/chai@npm:^5.2.1": + version: 5.2.1 + resolution: "@types/chai@npm:5.2.1" + dependencies: + "@types/deep-eql": "npm:*" + checksum: 10/101fcbed19aaecf87163a4261fb0f078b4cede99bc9863d3a288a3d76bc5edf18d3772bbe9bc28cf60dd19be8265eeae1c5bbe735de829e5a6905e96b45a1339 languageName: node linkType: hard @@ -8268,6 +8205,13 @@ __metadata: languageName: node linkType: hard +"@types/deep-eql@npm:*": + version: 4.0.2 + resolution: "@types/deep-eql@npm:4.0.2" + checksum: 10/249a27b0bb22f6aa28461db56afa21ec044fa0e303221a62dff81831b20c8530502175f1a49060f7099e7be06181078548ac47c668de79ff9880241968d43d0c + languageName: node + linkType: hard + "@types/dns-packet@npm:^5.6.5": version: 5.6.5 resolution: "@types/dns-packet@npm:5.6.5" @@ -8576,12 +8520,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.0.0": - version: 18.19.74 - resolution: "@types/node@npm:18.19.74" +"@types/node@npm:^18.19.86": + version: 18.19.86 + resolution: "@types/node@npm:18.19.86" dependencies: undici-types: "npm:~5.26.4" - checksum: 10/2306bd0b41cdd528b890b210b96f287a5b5035c128f62636057d6616bd612b3f53d32d77f7e76ef41a9f130ea691e6980e6d5942dd625df05d3a641764fddb78 + checksum: 10/83e8f07305b102776c1970c2fbe2347eba15f6cca3d50cf8991d5f4e463ee7e204fbb3dec599892d25e613ed3b93f7fb5794b0de874ea6ba884affbe99670cc2 languageName: node linkType: hard @@ -9032,24 +8976,22 @@ __metadata: languageName: node linkType: hard -"@wagmi/cli@npm:^2.0.3, @wagmi/cli@npm:^2.1.15": - version: 2.1.15 - resolution: "@wagmi/cli@npm:2.1.15" +"@wagmi/cli@npm:^2.2.1": + version: 2.2.1 + resolution: "@wagmi/cli@npm:2.2.1" dependencies: abitype: "npm:^1.0.4" bundle-require: "npm:^4.0.2" cac: "npm:^6.7.14" change-case: "npm:^5.4.4" - chokidar: "npm:^3.5.3" + chokidar: "npm:4.0.1" dedent: "npm:^0.7.0" dotenv: "npm:^16.3.1" dotenv-expand: "npm:^10.0.0" esbuild: "npm:^0.19.0" - execa: "npm:^8.0.1" + escalade: "npm:3.2.0" fdir: "npm:^6.1.1" - find-up: "npm:^6.3.0" - fs-extra: "npm:^11.2.0" - ora: "npm:^6.3.1" + nanospinner: "npm:1.2.2" pathe: "npm:^1.1.2" picocolors: "npm:^1.0.0" picomatch: "npm:^3.0.0" @@ -9063,11 +9005,32 @@ __metadata: optional: true bin: wagmi: dist/esm/cli.js - checksum: 10/495d4d3036f963162a0a6e4a3a7061831295448c2d5522ea021f23a578db256c4268657e28cd1c4c79be7551759adc6bd0aa614dc948ac66355288d7660b2b9c + checksum: 10/43815252063cef995370da90c74c36eaa816b25302578294c6fd7bd514845783bee5592e79fbd4beaed4e065cdbe8a181a648bb25c72ce273c543ea773479dfb languageName: node linkType: hard -"@wagmi/connectors@npm:5.7.7, @wagmi/connectors@npm:>=5.7": +"@wagmi/connectors@npm:5.7.12": + version: 5.7.12 + resolution: "@wagmi/connectors@npm:5.7.12" + dependencies: + "@coinbase/wallet-sdk": "npm:4.3.0" + "@metamask/sdk": "npm:0.32.0" + "@safe-global/safe-apps-provider": "npm:0.18.5" + "@safe-global/safe-apps-sdk": "npm:9.1.0" + "@walletconnect/ethereum-provider": "npm:2.19.2" + cbw-sdk: "npm:@coinbase/wallet-sdk@3.9.3" + peerDependencies: + "@wagmi/core": 2.16.7 + typescript: ">=5.0.4" + viem: 2.x + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/174e2fead2186f7392190212328be221888cc8eafaf4bbdc446b2d9a2f485e2b83a35842c35bc931bc05dd3d3dafab58c91ebc0e8c4ee5376297e5a022d8309f + languageName: node + linkType: hard + +"@wagmi/connectors@npm:>=5.7": version: 5.7.7 resolution: "@wagmi/connectors@npm:5.7.7" dependencies: @@ -9088,9 +9051,9 @@ __metadata: languageName: node linkType: hard -"@wagmi/core@npm:2.16.4": - version: 2.16.4 - resolution: "@wagmi/core@npm:2.16.4" +"@wagmi/core@npm:2.16.7": + version: 2.16.7 + resolution: "@wagmi/core@npm:2.16.7" dependencies: eventemitter3: "npm:5.0.1" mipd: "npm:0.0.7" @@ -9104,7 +9067,7 @@ __metadata: optional: true typescript: optional: true - checksum: 10/a2321f0abad1f3b5abd97d9ea6bf7b4e9b6e8b510694049749ec521f40251d3ccefc56d2c8a54fa097a1ce01f418ef3706639f6ac3d4f871bf46c927a55619db + checksum: 10/8ed7abaccca589b7de20d7a9be6d7490df77608de786a514ebc0a0287f53dc8d88bab1965f3d1d73304a7b77b63165e9a7f15db919204769736f9adafafe9dfd languageName: node linkType: hard @@ -9157,6 +9120,31 @@ __metadata: languageName: node linkType: hard +"@walletconnect/core@npm:2.19.2": + version: 2.19.2 + resolution: "@walletconnect/core@npm:2.19.2" + dependencies: + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/jsonrpc-ws-connection": "npm:1.0.16" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/relay-api": "npm:1.0.11" + "@walletconnect/relay-auth": "npm:1.1.0" + "@walletconnect/safe-json": "npm:1.0.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.19.2" + "@walletconnect/utils": "npm:2.19.2" + "@walletconnect/window-getters": "npm:1.0.1" + es-toolkit: "npm:1.33.0" + events: "npm:3.3.0" + uint8arrays: "npm:3.1.0" + checksum: 10/e21da2ce84864c3f0eb7cb9a0b0e4e55cbe139f2b2f7524a5c811f2fd26865ea61b92bb3b21d67f579d99668b1cb93f4d58889281c45756fb6da6f96824adcef + languageName: node + linkType: hard + "@walletconnect/environment@npm:^1.0.1": version: 1.0.1 resolution: "@walletconnect/environment@npm:1.0.1" @@ -9184,6 +9172,25 @@ __metadata: languageName: node linkType: hard +"@walletconnect/ethereum-provider@npm:2.19.2": + version: 2.19.2 + resolution: "@walletconnect/ethereum-provider@npm:2.19.2" + dependencies: + "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/modal": "npm:2.7.0" + "@walletconnect/sign-client": "npm:2.19.2" + "@walletconnect/types": "npm:2.19.2" + "@walletconnect/universal-provider": "npm:2.19.2" + "@walletconnect/utils": "npm:2.19.2" + events: "npm:3.3.0" + checksum: 10/c3f459c23922b5507b9a2ceff285c71419b4e7ad910a6dea6a668eb893de758ba8213773653635e8b0b423b88688970c9df4ffa3230cfc16585012fdecb306f5 + languageName: node + linkType: hard + "@walletconnect/events@npm:1.0.1, @walletconnect/events@npm:^1.0.1": version: 1.0.1 resolution: "@walletconnect/events@npm:1.0.1" @@ -9419,6 +9426,23 @@ __metadata: languageName: node linkType: hard +"@walletconnect/sign-client@npm:2.19.2": + version: 2.19.2 + resolution: "@walletconnect/sign-client@npm:2.19.2" + dependencies: + "@walletconnect/core": "npm:2.19.2" + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.19.2" + "@walletconnect/utils": "npm:2.19.2" + events: "npm:3.3.0" + checksum: 10/ea03c1af0ce15dfc6fa059611046d09c696d57e4ff5c894540542136102ac9faa0144f00a5f079441d9140f1e1c20a750164c4a7834b7f55f66ccbf241e0557a + languageName: node + linkType: hard + "@walletconnect/time@npm:1.0.2, @walletconnect/time@npm:^1.0.2": version: 1.0.2 resolution: "@walletconnect/time@npm:1.0.2" @@ -9456,6 +9480,20 @@ __metadata: languageName: node linkType: hard +"@walletconnect/types@npm:2.19.2": + version: 2.19.2 + resolution: "@walletconnect/types@npm:2.19.2" + dependencies: + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + events: "npm:3.3.0" + checksum: 10/ff9c2f2313ae45180e008c4c6796304033a11c2f3af15f975981c94b31f02bc65ef26eb61b63aa087af3c2fb5a262b725237b15c51498d57dad6726618f2b07b + languageName: node + linkType: hard + "@walletconnect/universal-provider@npm:2.17.0": version: 2.17.0 resolution: "@walletconnect/universal-provider@npm:2.17.0" @@ -9493,6 +9531,26 @@ __metadata: languageName: node linkType: hard +"@walletconnect/universal-provider@npm:2.19.2": + version: 2.19.2 + resolution: "@walletconnect/universal-provider@npm:2.19.2" + dependencies: + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/sign-client": "npm:2.19.2" + "@walletconnect/types": "npm:2.19.2" + "@walletconnect/utils": "npm:2.19.2" + es-toolkit: "npm:1.33.0" + events: "npm:3.3.0" + checksum: 10/3199358a902fbaf2b925a8dbff3c6210d9503c6a66ad6a6381008cdf50c5d7999ce5b0a0d23362bcd707c3076d56f7d2a99c1385c5f1ba7c18a8e368576e4095 + languageName: node + linkType: hard + "@walletconnect/utils@npm:2.17.0": version: 2.17.0 resolution: "@walletconnect/utils@npm:2.17.0" @@ -9542,6 +9600,31 @@ __metadata: languageName: node linkType: hard +"@walletconnect/utils@npm:2.19.2": + version: 2.19.2 + resolution: "@walletconnect/utils@npm:2.19.2" + dependencies: + "@noble/ciphers": "npm:1.2.1" + "@noble/curves": "npm:1.8.1" + "@noble/hashes": "npm:1.7.1" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/relay-api": "npm:1.0.11" + "@walletconnect/relay-auth": "npm:1.1.0" + "@walletconnect/safe-json": "npm:1.0.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.19.2" + "@walletconnect/window-getters": "npm:1.0.1" + "@walletconnect/window-metadata": "npm:1.0.1" + bs58: "npm:6.0.0" + detect-browser: "npm:5.3.0" + query-string: "npm:7.1.3" + uint8arrays: "npm:3.1.0" + viem: "npm:2.23.2" + checksum: 10/33d3dd2f39b76be17d85277a850676f69c2a542a8f03e480173404a21f7a747c3034577373e5801b5109db0fe24b11e79cb22b27bbb1927a70f844f905ab9e80 + languageName: node + linkType: hard + "@walletconnect/window-getters@npm:1.0.1, @walletconnect/window-getters@npm:^1.0.1": version: 1.0.1 resolution: "@walletconnect/window-getters@npm:1.0.1" @@ -9909,21 +9992,6 @@ __metadata: languageName: node linkType: hard -"abitype@npm:1.0.0": - version: 1.0.0 - resolution: "abitype@npm:1.0.0" - peerDependencies: - typescript: ">=5.0.4" - zod: ^3 >=3.22.0 - peerDependenciesMeta: - typescript: - optional: true - zod: - optional: true - checksum: 10/38c8d965c75c031854385f1c14da0410e271f1a8255332869a77a1ee836c4607420522c1f0077716c7ad7c4091f53c1b2681ed1d30b5161d1424fdb5a480f104 - languageName: node - linkType: hard - "abitype@npm:1.0.5, abitype@npm:^1.0.4": version: 1.0.5 resolution: "abitype@npm:1.0.5" @@ -9939,7 +10007,7 @@ __metadata: languageName: node linkType: hard -"abitype@npm:1.0.8": +"abitype@npm:1.0.8, abitype@npm:^1.0.8": version: 1.0.8 resolution: "abitype@npm:1.0.8" peerDependencies: @@ -9954,21 +10022,6 @@ __metadata: languageName: node linkType: hard -"abitype@npm:^0.10.3": - version: 0.10.3 - resolution: "abitype@npm:0.10.3" - peerDependencies: - typescript: ">=5.0.4" - zod: ^3 >=3.22.0 - peerDependenciesMeta: - typescript: - optional: true - zod: - optional: true - checksum: 10/6eefcd8a63e2ecfaa9089125734d4542e8094160b43b38469eba3dfece167947ef8754c895be1a6b312088012fdc1740f7e338918e7ec7775a62807daec33ef5 - languageName: node - linkType: hard - "abitype@npm:^1.0.6": version: 1.0.6 resolution: "abitype@npm:1.0.6" @@ -10667,6 +10720,13 @@ __metadata: languageName: node linkType: hard +"assertion-error@npm:^2.0.1": + version: 2.0.1 + resolution: "assertion-error@npm:2.0.1" + checksum: 10/a0789dd882211b87116e81e2648ccb7f60340b34f19877dd020b39ebb4714e475eb943e14ba3e22201c221ef6645b7bfe10297e76b6ac95b48a9898c1211ce66 + languageName: node + linkType: hard + "ast-parents@npm:^0.0.1": version: 0.0.1 resolution: "ast-parents@npm:0.0.1" @@ -11182,17 +11242,6 @@ __metadata: languageName: node linkType: hard -"bl@npm:^5.0.0": - version: 5.1.0 - resolution: "bl@npm:5.1.0" - dependencies: - buffer: "npm:^6.0.3" - inherits: "npm:^2.0.4" - readable-stream: "npm:^3.4.0" - checksum: 10/0340d3d70def4213cd9cbcd8592f7c5922d3668e7b231286c354613fac4a8411ad373cff26e06162da7423035bbd5caafce3e140a5f397be72fcd1e9d86f1179 - languageName: node - linkType: hard - "blakejs@npm:^1.1.0": version: 1.2.1 resolution: "blakejs@npm:1.2.1" @@ -11223,7 +11272,7 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9": +"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9": version: 4.12.0 resolution: "bn.js@npm:4.12.0" checksum: 10/10f8db196d3da5adfc3207d35d0a42aa29033eb33685f20ba2c36cadfe2de63dad05df0a20ab5aae01b418d1c4b3d4d205273085262fa020d17e93ff32b67527 @@ -11864,7 +11913,7 @@ __metadata: languageName: node linkType: hard -"chai@npm:^4.3.4, chai@npm:^4.5.0": +"chai@npm:^4.3.4": version: 4.5.0 resolution: "chai@npm:4.5.0" dependencies: @@ -11879,6 +11928,19 @@ __metadata: languageName: node linkType: hard +"chai@npm:^5.2.0": + version: 5.2.0 + resolution: "chai@npm:5.2.0" + dependencies: + assertion-error: "npm:^2.0.1" + check-error: "npm:^2.1.1" + deep-eql: "npm:^5.0.1" + loupe: "npm:^3.1.0" + pathval: "npm:^2.0.0" + checksum: 10/2ce03671c159c6a567bf1912756daabdbb7c075f3c0078f1b59d61da8d276936367ee696dfe093b49e1479d9ba93a6074c8e55d49791dddd8061728cdcad249e + languageName: node + linkType: hard + "chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -11889,7 +11951,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:5.3.0, chalk@npm:^5.0.0": +"chalk@npm:5.3.0": version: 5.3.0 resolution: "chalk@npm:5.3.0" checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea @@ -12013,6 +12075,13 @@ __metadata: languageName: node linkType: hard +"check-error@npm:^2.1.1": + version: 2.1.1 + resolution: "check-error@npm:2.1.1" + checksum: 10/d785ed17b1d4a4796b6e75c765a9a290098cf52ff9728ce0756e8ffd4293d2e419dd30c67200aee34202463b474306913f2fcfaf1890641026d9fc6966fea27a + languageName: node + linkType: hard + "check-types@npm:^11.2.3": version: 11.2.3 resolution: "check-types@npm:11.2.3" @@ -12168,7 +12237,7 @@ __metadata: languageName: node linkType: hard -"cli-spinners@npm:^2.2.0, cli-spinners@npm:^2.5.0, cli-spinners@npm:^2.6.1, cli-spinners@npm:^2.9.2": +"cli-spinners@npm:^2.2.0, cli-spinners@npm:^2.5.0, cli-spinners@npm:^2.9.2": version: 2.9.2 resolution: "cli-spinners@npm:2.9.2" checksum: 10/a0a863f442df35ed7294424f5491fa1756bd8d2e4ff0c8736531d886cec0ece4d85e8663b77a5afaf1d296e3cbbebff92e2e99f52bbea89b667cbe789b994794 @@ -13741,6 +13810,13 @@ __metadata: languageName: node linkType: hard +"deep-eql@npm:^5.0.1": + version: 5.0.2 + resolution: "deep-eql@npm:5.0.2" + checksum: 10/a529b81e2ef8821621d20a36959a0328873a3e49d393ad11f8efe8559f31239494c2eb889b80342808674c475802ba95b9d6c4c27641b9a029405104c1b59fcf + languageName: node + linkType: hard + "deep-extend@npm:^0.6.0, deep-extend@npm:~0.6.0": version: 0.6.0 resolution: "deep-extend@npm:0.6.0" @@ -14384,7 +14460,7 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:6.5.4, elliptic@npm:^6.5.2, elliptic@npm:^6.5.4": +"elliptic@npm:6.5.4, elliptic@npm:^6.5.4": version: 6.5.4 resolution: "elliptic@npm:6.5.4" dependencies: @@ -14750,6 +14826,18 @@ __metadata: languageName: node linkType: hard +"es-toolkit@npm:1.33.0": + version: 1.33.0 + resolution: "es-toolkit@npm:1.33.0" + dependenciesMeta: + "@trivago/prettier-plugin-sort-imports@4.3.0": + unplugged: true + prettier-plugin-sort-re-exports@0.0.1: + unplugged: true + checksum: 10/db613d885c407dc3b84b3939b8b0c9976f658bfb03fa0f9cd3a3fe8383a60a75e1e4f34584e86c3fbf00def50ea0ca5f1a5264a1014018286dedbed08426b5f0 + languageName: node + linkType: hard + "es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.62, es5-ext@npm:^0.10.63, es5-ext@npm:^0.10.64, es5-ext@npm:~0.10.14": version: 0.10.64 resolution: "es5-ext@npm:0.10.64" @@ -14959,6 +15047,13 @@ __metadata: languageName: node linkType: hard +"escalade@npm:3.2.0": + version: 3.2.0 + resolution: "escalade@npm:3.2.0" + checksum: 10/9d7169e3965b2f9ae46971afa392f6e5a25545ea30f2e2dd99c9b0a95a3f52b5653681a84f5b2911a413ddad2d7a93d3514165072f349b5ffc59c75a899970d6 + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -15631,7 +15726,7 @@ __metadata: languageName: node linkType: hard -"ethereum-cryptography@npm:0.1.3, ethereum-cryptography@npm:^0.1.3": +"ethereum-cryptography@npm:^0.1.3": version: 0.1.3 resolution: "ethereum-cryptography@npm:0.1.3" dependencies: @@ -15678,7 +15773,7 @@ __metadata: languageName: node linkType: hard -"ethereum-cryptography@npm:^2.1.3": +"ethereum-cryptography@npm:^2.1.3, ethereum-cryptography@npm:^2.2.1": version: 2.2.1 resolution: "ethereum-cryptography@npm:2.2.1" dependencies: @@ -15690,31 +15785,6 @@ __metadata: languageName: node linkType: hard -"ethereumjs-abi@npm:^0.6.8": - version: 0.6.8 - resolution: "ethereumjs-abi@npm:0.6.8" - dependencies: - bn.js: "npm:^4.11.8" - ethereumjs-util: "npm:^6.0.0" - checksum: 10/d4633ca30048b53c0f900ba5d7d6013ca228822055fbd93f975befc41f5c3054e0fffc27562d78050f164170e546af66c20e9ca1d35e67ea861df07d59a65a91 - languageName: node - linkType: hard - -"ethereumjs-util@npm:^6.0.0, ethereumjs-util@npm:^6.2.1": - version: 6.2.1 - resolution: "ethereumjs-util@npm:6.2.1" - dependencies: - "@types/bn.js": "npm:^4.11.3" - bn.js: "npm:^4.11.0" - create-hash: "npm:^1.1.2" - elliptic: "npm:^6.5.2" - ethereum-cryptography: "npm:^0.1.3" - ethjs-util: "npm:0.1.6" - rlp: "npm:^2.2.3" - checksum: 10/dedc8a623e21d1864b09c47f28851fc0fca6233cdefa4755a308507822ce75c893bbb2c3ba422109d1247986ec757941718f06574437e41b0d68604108b03fd0 - languageName: node - linkType: hard - "ethereumjs-util@npm:^7.0.3, ethereumjs-util@npm:^7.1.5": version: 7.1.5 resolution: "ethereumjs-util@npm:7.1.5" @@ -15728,7 +15798,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^5.7.0, ethers@npm:^5.7.2, ethers@npm:~5.7.0": +"ethers@npm:^5.7.0, ethers@npm:~5.7.0": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -15766,9 +15836,9 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^6.13.5": - version: 6.13.5 - resolution: "ethers@npm:6.13.5" +"ethers@npm:^6.13.6": + version: 6.13.6 + resolution: "ethers@npm:6.13.6" dependencies: "@adraffy/ens-normalize": "npm:1.10.1" "@noble/curves": "npm:1.2.0" @@ -15777,7 +15847,7 @@ __metadata: aes-js: "npm:4.0.0-beta.5" tslib: "npm:2.7.0" ws: "npm:8.17.1" - checksum: 10/ccba21a83679fb6a7c3eb9d187593501565d140064f2db28057a64d6707678bacf2adf4555882c4814688246da73173560df81fd3361fd2f227b5d3c75cb8685 + checksum: 10/271ea38276d28b0f8ed0a52c3c5c6f0efc3b2a9e17b29454ec3248d248c0b4793781d91e5fbf784781906afa30ec5b8bd670a9b0e71af271b1d3bcc0177e63df languageName: node linkType: hard @@ -15791,16 +15861,6 @@ __metadata: languageName: node linkType: hard -"ethjs-util@npm:0.1.6, ethjs-util@npm:^0.1.6": - version: 0.1.6 - resolution: "ethjs-util@npm:0.1.6" - dependencies: - is-hex-prefixed: "npm:1.0.0" - strip-hex-prefix: "npm:1.0.0" - checksum: 10/02e1d37f743a78742651a11be35461dfe8ed653f113d630435aada8036e1e199691c2cfffbbf1e800bfdeb14bb34c7ed69fab5d3c727058c1daf3effc6bf6f69 - languageName: node - linkType: hard - "event-emitter@npm:^0.3.5": version: 0.3.5 resolution: "event-emitter@npm:0.3.5" @@ -16399,16 +16459,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^6.3.0": - version: 6.3.0 - resolution: "find-up@npm:6.3.0" - dependencies: - locate-path: "npm:^7.1.0" - path-exists: "npm:^5.0.0" - checksum: 10/4f3bdc30d41778c647e53f4923e72de5e5fb055157031f34501c5b36c2eb59f77b997edf9cb00165c6060cda7eaa2e3da82cb6be2e61d68ad3e07c4bc4cce67e - languageName: node - linkType: hard - "find-yarn-workspace-root@npm:^2.0.0": version: 2.0.0 resolution: "find-yarn-workspace-root@npm:2.0.0" @@ -16588,7 +16638,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.2.0, fs-extra@npm:^11.0.0, fs-extra@npm:^11.2.0": +"fs-extra@npm:11.2.0, fs-extra@npm:^11.0.0": version: 11.2.0 resolution: "fs-extra@npm:11.2.0" dependencies: @@ -17133,7 +17183,7 @@ __metadata: languageName: node linkType: hard -"gluegun@npm:5.2.0": +"gluegun@npm:5.2.0, gluegun@npm:^5.2.0": version: 5.2.0 resolution: "gluegun@npm:5.2.0" dependencies: @@ -17173,46 +17223,6 @@ __metadata: languageName: node linkType: hard -"gluegun@npm:^5.1.2": - version: 5.1.6 - resolution: "gluegun@npm:5.1.6" - dependencies: - apisauce: "npm:^2.1.5" - app-module-path: "npm:^2.2.0" - cli-table3: "npm:0.6.0" - colors: "npm:1.4.0" - cosmiconfig: "npm:7.0.1" - cross-spawn: "npm:7.0.3" - ejs: "npm:3.1.8" - enquirer: "npm:2.3.6" - execa: "npm:5.1.1" - fs-jetpack: "npm:4.3.1" - lodash.camelcase: "npm:^4.3.0" - lodash.kebabcase: "npm:^4.1.1" - lodash.lowercase: "npm:^4.3.0" - lodash.lowerfirst: "npm:^4.3.1" - lodash.pad: "npm:^4.5.1" - lodash.padend: "npm:^4.6.1" - lodash.padstart: "npm:^4.6.1" - lodash.repeat: "npm:^4.1.0" - lodash.snakecase: "npm:^4.1.1" - lodash.startcase: "npm:^4.4.0" - lodash.trim: "npm:^4.5.1" - lodash.trimend: "npm:^4.5.1" - lodash.trimstart: "npm:^4.5.1" - lodash.uppercase: "npm:^4.3.0" - lodash.upperfirst: "npm:^4.3.1" - ora: "npm:4.0.2" - pluralize: "npm:^8.0.0" - semver: "npm:7.3.5" - which: "npm:2.0.2" - yargs-parser: "npm:^21.0.0" - bin: - gluegun: bin/gluegun - checksum: 10/b6a9938307611e200b799158fca3d3631c194dc0d74e708211d21d894550a8de55ce4d15711d8ac746ea8d4a5538231e96abd1e0bac299f5c0fbd09a0763c433 - languageName: node - linkType: hard - "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -17428,9 +17438,9 @@ __metadata: languageName: node linkType: hard -"hardhat-deploy@npm:^0.14.0": - version: 0.14.0 - resolution: "hardhat-deploy@npm:0.14.0" +"hardhat-deploy@npm:^1.0.2": + version: 1.0.2 + resolution: "hardhat-deploy@npm:1.0.2" dependencies: "@ethersproject/abi": "npm:^5.7.0" "@ethersproject/abstract-signer": "npm:^5.7.0" @@ -17456,7 +17466,7 @@ __metadata: murmur-128: "npm:^0.2.1" qs: "npm:^6.9.4" zksync-ethers: "npm:^5.0.0" - checksum: 10/aeb88872b9fe2646a92b9e6a825eaa7a60217ffb73f268390420b7544a78fa4f29e472f1243b5d91bacff9a1376041b2c8d67b87565affe09c4169f59d5a862c + checksum: 10/76882b56fa6103ebe080077f00eb75a04914c7c2f931b2ecec02922d5105a01d3cd1dec3238b4050c9be88f2e45034035d208f4aa2ab7789cccbba414feb972d languageName: node linkType: hard @@ -17477,9 +17487,9 @@ __metadata: languageName: node linkType: hard -"hardhat-gas-reporter@npm:^2.2.2": - version: 2.2.2 - resolution: "hardhat-gas-reporter@npm:2.2.2" +"hardhat-gas-reporter@npm:^2.2.3": + version: 2.2.3 + resolution: "hardhat-gas-reporter@npm:2.2.3" dependencies: "@ethersproject/abi": "npm:^5.7.0" "@ethersproject/bytes": "npm:^5.7.0" @@ -17495,10 +17505,10 @@ __metadata: lodash: "npm:^4.17.21" markdown-table: "npm:2.0.0" sha1: "npm:^1.1.1" - viem: "npm:2.7.14" + viem: "npm:^2.27.0" peerDependencies: hardhat: ^2.16.0 - checksum: 10/32a13011b414bae887741907bb2ea23cda0e645fb4fdfce87bed5a37be95f26a723ccc4140b413ec215832d6cc0fa5ff517f6d47af1bbedee5508bb5432269d7 + checksum: 10/150d44d2b8ebf76b8ab67a0b5b9cf7c4297e8330fbebc4134305e46385235b723b077caac2a9977b3bd8477e97be3b0f4be6026c47b69eadd7b325c45fc7c2cb languageName: node linkType: hard @@ -17513,16 +17523,13 @@ __metadata: languageName: node linkType: hard -"hardhat@npm:2.22.18": - version: 2.22.18 - resolution: "hardhat@npm:2.22.18" +"hardhat@npm:2.23.0": + version: 2.23.0 + resolution: "hardhat@npm:2.23.0" dependencies: + "@ethereumjs/util": "npm:^9.1.0" "@ethersproject/abi": "npm:^5.1.2" - "@metamask/eth-sig-util": "npm:^4.0.0" - "@nomicfoundation/edr": "npm:^0.7.0" - "@nomicfoundation/ethereumjs-common": "npm:4.0.4" - "@nomicfoundation/ethereumjs-tx": "npm:5.0.4" - "@nomicfoundation/ethereumjs-util": "npm:9.0.4" + "@nomicfoundation/edr": "npm:^0.10.0" "@nomicfoundation/solidity-analyzer": "npm:^0.1.0" "@sentry/node": "npm:^5.18.1" "@types/bn.js": "npm:^5.1.0" @@ -17537,7 +17544,6 @@ __metadata: enquirer: "npm:^2.3.0" env-paths: "npm:^2.2.0" ethereum-cryptography: "npm:^1.0.3" - ethereumjs-abi: "npm:^0.6.8" find-up: "npm:^5.0.0" fp-ts: "npm:1.19.3" fs-extra: "npm:^7.0.1" @@ -17546,6 +17552,7 @@ __metadata: json-stream-stringify: "npm:^3.1.4" keccak: "npm:^3.0.2" lodash: "npm:^4.17.11" + micro-eth-signer: "npm:^0.14.0" mnemonist: "npm:^0.38.0" mocha: "npm:^10.0.0" p-map: "npm:^4.0.0" @@ -17571,7 +17578,7 @@ __metadata: optional: true bin: hardhat: internal/cli/bootstrap.js - checksum: 10/521d46b31d15cda4c38b4e1995ba47bd34386bd10aa0554be4e2e7c9c889d25ce57c4018c76eda94168da5bab697ab5ad98b2715a1033247a0414a8853787bdd + checksum: 10/1feb1a8ed62e237b0197ad64217c2cc5dade9875adc9ec3ccb859141801173729a5b2ee0a8f5d1dcb8fca20bd38b53b819020f93c80af8d441648cecf8a32539 languageName: node linkType: hard @@ -18629,13 +18636,6 @@ __metadata: languageName: node linkType: hard -"is-interactive@npm:^2.0.0": - version: 2.0.0 - resolution: "is-interactive@npm:2.0.0" - checksum: 10/e8d52ad490bed7ae665032c7675ec07732bbfe25808b0efbc4d5a76b1a1f01c165f332775c63e25e9a03d319ebb6b24f571a9e902669fc1e40b0a60b5be6e26c - languageName: node - linkType: hard - "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -18893,13 +18893,6 @@ __metadata: languageName: node linkType: hard -"is-unicode-supported@npm:^1.1.0": - version: 1.3.0 - resolution: "is-unicode-supported@npm:1.3.0" - checksum: 10/20a1fc161afafaf49243551a5ac33b6c4cf0bbcce369fcd8f2951fbdd000c30698ce320de3ee6830497310a8f41880f8066d440aa3eb0a853e2aa4836dd89abc - languageName: node - linkType: hard - "is-upper-case@npm:^2.0.2": version: 2.0.2 resolution: "is-upper-case@npm:2.0.2" @@ -19029,15 +19022,6 @@ __metadata: languageName: node linkType: hard -"isows@npm:1.0.3": - version: 1.0.3 - resolution: "isows@npm:1.0.3" - peerDependencies: - ws: "*" - checksum: 10/9cacd5cf59f67deb51e825580cd445ab1725ecb05a67c704050383fb772856f3cd5e7da8ad08f5a3bd2823680d77d099459d0c6a7037972a74d6429af61af440 - languageName: node - linkType: hard - "isows@npm:1.0.4": version: 1.0.4 resolution: "isows@npm:1.0.4" @@ -20656,15 +20640,6 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^7.1.0": - version: 7.2.0 - resolution: "locate-path@npm:7.2.0" - dependencies: - p-locate: "npm:^6.0.0" - checksum: 10/1c6d269d4efec555937081be964e8a9b4a136319c79ca1d45ac6382212a8466113c75bd89e44521ca8ecd1c47fb08523b56eee5c0712bc7d14fec5f729deeb42 - languageName: node - linkType: hard - "lodash.camelcase@npm:^4.3.0": version: 4.3.0 resolution: "lodash.camelcase@npm:4.3.0" @@ -20894,16 +20869,6 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:^5.1.0": - version: 5.1.0 - resolution: "log-symbols@npm:5.1.0" - dependencies: - chalk: "npm:^5.0.0" - is-unicode-supported: "npm:^1.1.0" - checksum: 10/7291b6e7f1b3df6865bdaeb9b59605c832668ac2fa0965c63b1e7dd3700349aec09c1d7d40c368d5041ff58b7f89461a56e4009471921301af7b3609cbff9a29 - languageName: node - linkType: hard - "log-update@npm:^4.0.0": version: 4.0.0 resolution: "log-update@npm:4.0.0" @@ -20963,6 +20928,13 @@ __metadata: languageName: node linkType: hard +"loupe@npm:^3.1.0": + version: 3.1.3 + resolution: "loupe@npm:3.1.3" + checksum: 10/9e98c34daf0eba48ccc603595e51f2ae002110982d84879cf78c51de2c632f0c571dfe82ce4210af60c32203d06b443465c269bda925076fe6d9b612cc65c321 + languageName: node + linkType: hard + "lower-case-first@npm:^2.0.2": version: 2.0.2 resolution: "lower-case-first@npm:2.0.2" @@ -21368,6 +21340,17 @@ __metadata: languageName: node linkType: hard +"micro-eth-signer@npm:^0.14.0": + version: 0.14.0 + resolution: "micro-eth-signer@npm:0.14.0" + dependencies: + "@noble/curves": "npm:~1.8.1" + "@noble/hashes": "npm:~1.7.1" + micro-packed: "npm:~0.7.2" + checksum: 10/de9fb0262253c22f280dc6fae18b61950ac2bf0e086d9ca60e3dd150f64b922ca9073e7566ebfc71be773507f3979ebdccee8bc9bb1162697b7e0eeec1dbd691 + languageName: node + linkType: hard + "micro-ftch@npm:^0.3.1": version: 0.3.1 resolution: "micro-ftch@npm:0.3.1" @@ -21375,6 +21358,15 @@ __metadata: languageName: node linkType: hard +"micro-packed@npm:~0.7.2": + version: 0.7.2 + resolution: "micro-packed@npm:0.7.2" + dependencies: + "@scure/base": "npm:~1.2.2" + checksum: 10/dfda401ff3ba196447cb8a4bdf4e280cb2ef681d1d69b49cc3dc4172337c56efb325ba0c89c5028fc0729880836283b66ba9eded0456c9603e332680cd486b2d + languageName: node + linkType: hard + "micromark-core-commonmark@npm:^1.0.1": version: 1.1.0 resolution: "micromark-core-commonmark@npm:1.1.0" @@ -22188,6 +22180,15 @@ __metadata: languageName: node linkType: hard +"nanospinner@npm:1.2.2": + version: 1.2.2 + resolution: "nanospinner@npm:1.2.2" + dependencies: + picocolors: "npm:^1.1.1" + checksum: 10/40ed63364c95b58806a9989b16af8728fdb57d19a8bf05e643542a0c64b184df29435308a07a618af48817f22850dc1ef5827724c226047cab7e70bd22705a0e + languageName: node + linkType: hard + "napi-wasm@npm:^1.1.0": version: 1.1.0 resolution: "napi-wasm@npm:1.1.0" @@ -22875,23 +22876,6 @@ __metadata: languageName: node linkType: hard -"ora@npm:^6.3.1": - version: 6.3.1 - resolution: "ora@npm:6.3.1" - dependencies: - chalk: "npm:^5.0.0" - cli-cursor: "npm:^4.0.0" - cli-spinners: "npm:^2.6.1" - is-interactive: "npm:^2.0.0" - is-unicode-supported: "npm:^1.1.0" - log-symbols: "npm:^5.1.0" - stdin-discarder: "npm:^0.1.0" - strip-ansi: "npm:^7.0.1" - wcwidth: "npm:^1.0.1" - checksum: 10/6c885f2a9e5ec6815477c78955a1c9c460c221063f078077d8a02bb50f9aedf390fddb321c6821cd107b3d250114a53fffbde65b705280ea8b77810bf4fc6e2c - languageName: node - linkType: hard - "ordinal@npm:^1.0.3": version: 1.0.3 resolution: "ordinal@npm:1.0.3" @@ -23044,15 +23028,6 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^4.0.0": - version: 4.0.0 - resolution: "p-limit@npm:4.0.0" - dependencies: - yocto-queue: "npm:^1.0.0" - checksum: 10/01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b - languageName: node - linkType: hard - "p-locate@npm:^2.0.0": version: 2.0.0 resolution: "p-locate@npm:2.0.0" @@ -23089,15 +23064,6 @@ __metadata: languageName: node linkType: hard -"p-locate@npm:^6.0.0": - version: 6.0.0 - resolution: "p-locate@npm:6.0.0" - dependencies: - p-limit: "npm:^4.0.0" - checksum: 10/2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38 - languageName: node - linkType: hard - "p-map@npm:^2.0.0": version: 2.1.0 resolution: "p-map@npm:2.1.0" @@ -23349,13 +23315,6 @@ __metadata: languageName: node linkType: hard -"path-exists@npm:^5.0.0": - version: 5.0.0 - resolution: "path-exists@npm:5.0.0" - checksum: 10/8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254 - languageName: node - linkType: hard - "path-is-absolute@npm:^1.0.0": version: 1.0.1 resolution: "path-is-absolute@npm:1.0.1" @@ -23471,6 +23430,13 @@ __metadata: languageName: node linkType: hard +"pathval@npm:^2.0.0": + version: 2.0.0 + resolution: "pathval@npm:2.0.0" + checksum: 10/b91575bf9cdf01757afd7b5e521eb8a0b874a49bc972d08e0047cfea0cd3c019f5614521d4bc83d2855e3fcc331db6817dfd533dd8f3d90b16bc76fad2450fc1 + languageName: node + linkType: hard + "pbkdf2@npm:^3.0.17, pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2": version: 3.1.2 resolution: "pbkdf2@npm:3.1.2" @@ -23534,6 +23500,13 @@ __metadata: languageName: node linkType: hard +"picocolors@npm:^1.1.1": + version: 1.1.1 + resolution: "picocolors@npm:1.1.1" + checksum: 10/e1cf46bf84886c79055fdfa9dcb3e4711ad259949e3565154b004b260cd356c5d54b31a1437ce9782624bf766272fe6b0154f5f0c744fb7af5d454d2b60db045 + languageName: node + linkType: hard + "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" @@ -26328,7 +26301,7 @@ __metadata: languageName: node linkType: hard -"rlp@npm:^2.2.3, rlp@npm:^2.2.4": +"rlp@npm:^2.2.4": version: 2.2.7 resolution: "rlp@npm:2.2.7" dependencies: @@ -27729,15 +27702,6 @@ __metadata: languageName: node linkType: hard -"stdin-discarder@npm:^0.1.0": - version: 0.1.0 - resolution: "stdin-discarder@npm:0.1.0" - dependencies: - bl: "npm:^5.0.0" - checksum: 10/85131f70ae2830144133b7a6211d56f9ac2603573f4af3d0b66e828af5e13fcdea351f9192f86bb7fed2c64604c8097bf36d50cb77d54e898ce4604c3b7b6b8f - languageName: node - linkType: hard - "stream-browserify@npm:^3.0.0": version: 3.0.0 resolution: "stream-browserify@npm:3.0.0" @@ -28914,20 +28878,6 @@ __metadata: languageName: node linkType: hard -"tweetnacl-util@npm:^0.15.1": - version: 0.15.1 - resolution: "tweetnacl-util@npm:0.15.1" - checksum: 10/ae6aa8a52cdd21a95103a4cc10657d6a2040b36c7a6da7b9d3ab811c6750a2d5db77e8c36969e75fdee11f511aa2b91c552496c6e8e989b6e490e54aca2864fc - languageName: node - linkType: hard - -"tweetnacl@npm:^1.0.3": - version: 1.0.3 - resolution: "tweetnacl@npm:1.0.3" - checksum: 10/ca122c2f86631f3c0f6d28efb44af2a301d4a557a62a3e2460286b08e97567b258c2212e4ad1cfa22bd6a57edcdc54ba76ebe946847450ab0999e6d48ccae332 - languageName: node - linkType: hard - "type-check@npm:^0.4.0, type-check@npm:~0.4.0": version: 0.4.0 resolution: "type-check@npm:0.4.0" @@ -29915,24 +29865,24 @@ __metadata: languageName: node linkType: hard -"viem@npm:2.7.14": - version: 2.7.14 - resolution: "viem@npm:2.7.14" +"viem@npm:2.23.2": + version: 2.23.2 + resolution: "viem@npm:2.23.2" dependencies: - "@adraffy/ens-normalize": "npm:1.10.0" - "@noble/curves": "npm:1.2.0" - "@noble/hashes": "npm:1.3.2" - "@scure/bip32": "npm:1.3.2" - "@scure/bip39": "npm:1.2.1" - abitype: "npm:1.0.0" - isows: "npm:1.0.3" - ws: "npm:8.13.0" + "@noble/curves": "npm:1.8.1" + "@noble/hashes": "npm:1.7.1" + "@scure/bip32": "npm:1.6.2" + "@scure/bip39": "npm:1.5.4" + abitype: "npm:1.0.8" + isows: "npm:1.0.6" + ox: "npm:0.6.7" + ws: "npm:8.18.0" peerDependencies: typescript: ">=5.0.4" peerDependenciesMeta: typescript: optional: true - checksum: 10/fda804cdbf0bace0368d0ae6342749f19639675631d8c41f0810692de1af3c61a8ea2548aceebeef7bada9c547ff58b2e45a0225b77a4bfbf0e1ef371dbd3acf + checksum: 10/847fdb57a6941f67c4ff97c79d99368c48e78b9c070df8fb3f3310d58bbd075fd78e9a506abccb82fcdbcf0c6c13aba7cfb021e37fda0777ea1eb0ccecf25fe1 languageName: node linkType: hard @@ -29958,7 +29908,7 @@ __metadata: languageName: node linkType: hard -"viem@npm:>=2.23, viem@npm:>=2.23.0, viem@npm:^2.22.22": +"viem@npm:>=2.23, viem@npm:>=2.23.0": version: 2.23.0 resolution: "viem@npm:2.23.0" dependencies: @@ -30000,6 +29950,27 @@ __metadata: languageName: node linkType: hard +"viem@npm:^2.27.0, viem@npm:^2.27.2": + version: 2.27.2 + resolution: "viem@npm:2.27.2" + dependencies: + "@noble/curves": "npm:1.8.1" + "@noble/hashes": "npm:1.7.1" + "@scure/bip32": "npm:1.6.2" + "@scure/bip39": "npm:1.5.4" + abitype: "npm:1.0.8" + isows: "npm:1.0.6" + ox: "npm:0.6.9" + ws: "npm:8.18.1" + peerDependencies: + typescript: ">=5.0.4" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/c468c49969df005af85b2c68345db6f1f16d533e3488186a238699df378a3bce687deff4a7fc55cd2b0671e56a408ef5b2c1b5aa67df1a11668919c4f83bb23e + languageName: node + linkType: hard + "vite-plugin-node-polyfills@npm:^0.21.0": version: 0.21.0 resolution: "vite-plugin-node-polyfills@npm:0.21.0" @@ -30200,12 +30171,12 @@ __metadata: languageName: node linkType: hard -"wagmi@npm:^2.14.10": - version: 2.14.11 - resolution: "wagmi@npm:2.14.11" +"wagmi@npm:^2.14.16": + version: 2.14.16 + resolution: "wagmi@npm:2.14.16" dependencies: - "@wagmi/connectors": "npm:5.7.7" - "@wagmi/core": "npm:2.16.4" + "@wagmi/connectors": "npm:5.7.12" + "@wagmi/core": "npm:2.16.7" use-sync-external-store: "npm:1.4.0" peerDependencies: "@tanstack/react-query": ">=5.0.0" @@ -30215,7 +30186,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/c78ca646cd16d6c949b6079f9ca9dcc25564c574957ec6a3c2aa65f927f8e1daa898959effde92ec5d64c22aae1f3a759a29a85291521f4931dd684d5ce5e29e + checksum: 10/643825df1a81fa755e180945bbd7488f6d87e826cf4db1e8b674e987d1c93fff548519792a4f7498d007321b9aba5ba3988abe945b4eea94a10ba3869307ec16 languageName: node linkType: hard @@ -31071,21 +31042,6 @@ __metadata: languageName: node linkType: hard -"ws@npm:8.13.0": - version: 8.13.0 - resolution: "ws@npm:8.13.0" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 10/1769532b6fdab9ff659f0b17810e7501831d34ecca23fd179ee64091dd93a51f42c59f6c7bb4c7a384b6c229aca8076fb312aa35626257c18081511ef62a161d - languageName: node - linkType: hard - "ws@npm:8.17.1, ws@npm:~8.17.1": version: 8.17.1 resolution: "ws@npm:8.17.1" @@ -31398,13 +31354,6 @@ __metadata: languageName: node linkType: hard -"yocto-queue@npm:^1.0.0": - version: 1.0.0 - resolution: "yocto-queue@npm:1.0.0" - checksum: 10/2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801 - languageName: node - linkType: hard - "yoctocolors-cjs@npm:^2.1.2": version: 2.1.2 resolution: "yoctocolors-cjs@npm:2.1.2" From bed59c32644ee16fb59f83711494850eeff53d41 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Thu, 17 Apr 2025 20:34:15 +0100 Subject: [PATCH 05/10] chore: devnet subgraph redeploy --- subgraph/package.json | 2 +- subgraph/subgraph.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/subgraph/package.json b/subgraph/package.json index 8d238a51..8ff66b22 100644 --- a/subgraph/package.json +++ b/subgraph/package.json @@ -1,6 +1,6 @@ { "name": "@kleros/escrow-v2-subgraph", - "version": "2.0.8", + "version": "2.1.0", "license": "MIT", "scripts": { "update:arbitrum-sepolia-devnet": "./scripts/update.sh arbitrumSepoliaDevnet arbitrum-sepolia", diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml index 147bcf8c..88b7019f 100644 --- a/subgraph/subgraph.yaml +++ b/subgraph/subgraph.yaml @@ -4,11 +4,11 @@ schema: dataSources: - kind: ethereum name: EscrowUniversal - network: arbitrum-one + network: arbitrum-sepolia source: - address: '0x79530E7Bb3950A3a4b5a167816154715681F2f6c' + address: '0x5ef185810BCe41c03c9E5ca271B8C91F1024F953' abi: EscrowUniversal - startBlock: 305434342 + startBlock: 123526741 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -22,7 +22,7 @@ dataSources: - SettlementProposal abis: - name: EscrowUniversal - file: ../contracts/deployments/arbitrum/EscrowUniversal.json + file: ../contracts/deployments/arbitrumSepoliaDevnet/EscrowUniversal.json eventHandlers: - event: Payment(indexed uint256,uint256,address) handler: handlePayment From 19e277d7c95a19adee716933abcb0819bf144291 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Fri, 18 Apr 2025 15:23:25 +0100 Subject: [PATCH 06/10] fix(web): contract arbitrators in wagmi hook generation --- contracts/package.json | 2 +- web/package.json | 1 + web/src/consts/arbitration.ts | 11 ---- .../useArbitrationCostFromKlerosCore.ts | 22 -------- .../TransactionDetails/index.tsx | 4 +- web/wagmi.config.ts | 54 +++++++++++++++++-- yarn.lock | 11 ++-- 7 files changed, 61 insertions(+), 44 deletions(-) delete mode 100644 web/src/consts/arbitration.ts delete mode 100644 web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts diff --git a/contracts/package.json b/contracts/package.json index d3ab0dda..14d9ab6b 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -83,7 +83,7 @@ "typescript": "^5.7.3" }, "dependencies": { - "@kleros/kleros-v2-contracts": "^0.9.2", + "@kleros/kleros-v2-contracts": "^0.9.3", "@openzeppelin/contracts": "^5.3.0" } } diff --git a/web/package.json b/web/package.json index fa6a007d..5bfd06ba 100644 --- a/web/package.json +++ b/web/package.json @@ -45,6 +45,7 @@ "devDependencies": { "@graphql-codegen/cli": "^4.0.1", "@graphql-codegen/client-preset": "^4.6.2", + "@kleros/kleros-v2-contracts": "^0.9.3", "@types/react": "^18.2.59", "@types/react-dom": "^18.2.18", "@types/react-modal": "^3.16.3", diff --git a/web/src/consts/arbitration.ts b/web/src/consts/arbitration.ts deleted file mode 100644 index a31937af..00000000 --- a/web/src/consts/arbitration.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { DEFAULT_CHAIN } from "./chains"; - -import arbitrumSepoliaDevnet from "@kleros/kleros-v2-contracts/deployments/arbitrumSepoliaDevnet"; -import arbitrum from "@kleros/kleros-v2-contracts/deployments/arbitrum"; - -const deploymentsByChainId: Record = { - 421614: arbitrumSepoliaDevnet, - 42161: arbitrum, -}; - -export const KLEROS_CORE_ADDRESS = deploymentsByChainId[DEFAULT_CHAIN].contracts.KlerosCore.address; diff --git a/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts b/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts deleted file mode 100644 index 37cbc850..00000000 --- a/web/src/hooks/queries/useArbitrationCostFromKlerosCore.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { useReadContract } from "wagmi"; -import { parseAbi } from "viem"; -import { KLEROS_CORE_ADDRESS } from "consts/arbitration"; - -const KLEROS_CORE_ABI = parseAbi([ - "function arbitrationCost(bytes _extraData) view returns (uint256 cost)", -]); - -export const useArbitrationCost = (arbitratorExtraData: string) => { - const { data, isError, isLoading } = useReadContract({ - address: KLEROS_CORE_ADDRESS, - abi: KLEROS_CORE_ABI, - functionName: "arbitrationCost", - args: [arbitratorExtraData], - }); - - return { - arbitrationCost: data !== undefined ? data : null, - isLoading, - isError, - }; -}; \ No newline at end of file diff --git a/web/src/pages/MyTransactions/TransactionDetails/index.tsx b/web/src/pages/MyTransactions/TransactionDetails/index.tsx index 75328b74..6e6df50a 100644 --- a/web/src/pages/MyTransactions/TransactionDetails/index.tsx +++ b/web/src/pages/MyTransactions/TransactionDetails/index.tsx @@ -10,7 +10,7 @@ import WasItFulfilled from "./WasItFulfilled"; import InfoCards from "./InfoCards"; import { useEscrowParametersQuery } from "queries/useEscrowParametersQuery"; import { useTransactionDetailsQuery } from "queries/useTransactionsQuery"; -import { useArbitrationCost } from "queries/useArbitrationCostFromKlerosCore"; +import { useReadKlerosCoreArbitrationCost } from "hooks/contracts/generated"; import { useNativeTokenSymbol } from "hooks/useNativeTokenSymbol"; import useFetchIpfsJson from "hooks/useFetchIpfsJson"; import { useTokenMetadata } from "hooks/useTokenMetadata"; @@ -32,7 +32,7 @@ const TransactionDetails: React.FC = () => { const { id } = useParams(); const { data: transactionDetails } = useTransactionDetailsQuery(id); const { data: escrowParameters } = useEscrowParametersQuery(); - const { arbitrationCost } = useArbitrationCost(escrowParameters?.escrowParameters?.arbitratorExtraData); + const arbitrationCost = useReadKlerosCoreArbitrationCost(escrowParameters?.escrowParameters?.arbitratorExtraData); const nativeTokenSymbol = useNativeTokenSymbol(); const { tokenMetadata } = useTokenMetadata(transactionDetails?.escrow?.token); const erc20TokenSymbol = tokenMetadata?.symbol; diff --git a/web/wagmi.config.ts b/web/wagmi.config.ts index d70a3c40..b8dcba49 100644 --- a/web/wagmi.config.ts +++ b/web/wagmi.config.ts @@ -4,17 +4,57 @@ import { readdir, readFile } from "fs/promises"; import { parse, join } from "path"; import { Chain } from "wagmi/chains"; import dotenv from "dotenv"; +import { + arbitrumSepoliaDevnet as arbitratorDevnet, + arbitrumSepolia as arbitratorTestnet, + arbitrum as arbitratorMainnet, +} from "@kleros/kleros-v2-contracts/cjs/deployments"; dotenv.config(); -const readArtifacts = async (viemChainName: string, hardhatChainName?: string) => { +type ArbitratorContracts = { + default: { + contracts: { + KlerosCore: { + address: `0x${string}`; + abi: any[]; + }; + }; + }; +}; + +const addArbitratorContract = ({ + results, + chain, + name, + contract, +}: { + results: ContractConfig[]; + chain: Chain; + name: string; + contract: { address: `0x${string}`; abi: any[] }; +}) => { + results.push({ + name, + address: { + [chain.id]: contract.address as `0x{string}`, + }, + abi: contract.abi, + }); +}; + +const readArtifacts = async ( + viemChainName: string, + hardhatChainName: string, + arbitratorContracts: ArbitratorContracts +) => { const chains = await import("wagmi/chains"); const chain = chains[viemChainName] as Chain; if (!chain) { throw new Error(`Viem chain ${viemChainName} not found`); } - const directoryPath = `../contracts/deployments/${hardhatChainName ?? viemChainName}`; + const directoryPath = `../contracts/deployments/${hardhatChainName}`; const files = await readdir(directoryPath); const results: ContractConfig[] = []; @@ -33,6 +73,10 @@ const readArtifacts = async (viemChainName: string, hardhatChainName?: string) = }); } } + + const { KlerosCore } = arbitratorContracts.default.contracts; + const arbitratorContractConfigs = [{ name: "KlerosCore", contract: KlerosCore }]; + arbitratorContractConfigs.forEach(({ name, contract }) => addArbitratorContract({ results, chain, name, contract })); return results; }; @@ -41,24 +85,28 @@ const getConfig = async (): Promise => { let viemNetwork: string; let hardhatNetwork: string; + let arbitratorContracts; switch (deployment) { case "devnet": viemNetwork = "arbitrumSepolia"; hardhatNetwork = "arbitrumSepoliaDevnet"; + arbitratorContracts = arbitratorDevnet; break; case "testnet": viemNetwork = "arbitrumSepolia"; hardhatNetwork = "arbitrumSepolia"; + arbitratorContracts = arbitratorTestnet; break; case "mainnet": viemNetwork = "arbitrum"; hardhatNetwork = "arbitrum"; + arbitratorContracts = arbitratorMainnet; break; default: throw new Error(`Unknown deployment ${deployment}`); } - const deploymentContracts = await readArtifacts(viemNetwork, hardhatNetwork); + const deploymentContracts = await readArtifacts(viemNetwork, hardhatNetwork, arbitratorContracts); return { out: "src/hooks/contracts/generated.ts", diff --git a/yarn.lock b/yarn.lock index 9de06e72..d9c86379 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4956,7 +4956,7 @@ __metadata: "@kleros/escrow-v2-eslint-config": "workspace:^" "@kleros/escrow-v2-prettier-config": "workspace:^" "@kleros/escrow-v2-tsconfig": "workspace:^" - "@kleros/kleros-v2-contracts": "npm:^0.9.2" + "@kleros/kleros-v2-contracts": "npm:^0.9.3" "@logtail/pino": "npm:^0.4.0" "@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.8" "@nomicfoundation/hardhat-ethers": "npm:^3.0.8" @@ -5050,6 +5050,7 @@ __metadata: "@graphql-codegen/cli": "npm:^4.0.1" "@graphql-codegen/client-preset": "npm:^4.6.2" "@kleros/kleros-app": "npm:^2.1.0" + "@kleros/kleros-v2-contracts": "npm:^0.9.3" "@kleros/ui-components-library": "npm:^2.19.0" "@reown/appkit": "npm:^1.6.6" "@reown/appkit-adapter-wagmi": "npm:^1.6.6" @@ -5121,15 +5122,15 @@ __metadata: languageName: node linkType: hard -"@kleros/kleros-v2-contracts@npm:^0.9.2": - version: 0.9.2 - resolution: "@kleros/kleros-v2-contracts@npm:0.9.2" +"@kleros/kleros-v2-contracts@npm:^0.9.3": + version: 0.9.3 + resolution: "@kleros/kleros-v2-contracts@npm:0.9.3" dependencies: "@chainlink/contracts": "npm:^1.3.0" "@kleros/vea-contracts": "npm:^0.6.0" "@openzeppelin/contracts": "npm:^5.2.0" viem: "npm:^2.24.1" - checksum: 10/8774811f7f49a25739e679ca7dc4fb10d86b635406473488f912d1445ed95107d46995b979882e8acdb762faad037c17b305007997cf70158aa6f95ae79bdd00 + checksum: 10/39862f09fc516f24e1ec2fc3bdde22aa83f58bada40c58e83ca15c8422b713cb8eac666673c67daf4873f4ca3d7c80ca3b7448d56936165847298b93ca2a9478 languageName: node linkType: hard From ae9a0272dd4258a1d8a7bdc5ed3f47a446155087 Mon Sep 17 00:00:00 2001 From: kemuru <102478601+kemuru@users.noreply.github.com> Date: Fri, 18 Apr 2025 19:41:04 +0200 Subject: [PATCH 07/10] fix: attachmentdisplay fix --- web/src/components/ScrollTop.tsx | 33 +++++++++++++++++++++ web/src/hooks/useScrollTop.ts | 15 ++++++++++ web/src/pages/AttachmentDisplay/index.tsx | 35 ++++++++++++++++------- 3 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 web/src/components/ScrollTop.tsx create mode 100644 web/src/hooks/useScrollTop.ts diff --git a/web/src/components/ScrollTop.tsx b/web/src/components/ScrollTop.tsx new file mode 100644 index 00000000..77e4706d --- /dev/null +++ b/web/src/components/ScrollTop.tsx @@ -0,0 +1,33 @@ +import React, { useEffect, useRef } from "react"; +import { useLocation, useNavigate } from "react-router-dom"; + +import { useScrollTop } from "hooks/useScrollTop"; + +const ScrollTop: React.FC = () => { + const scrollTop = useScrollTop(); + const { search, pathname } = useLocation(); + const navigate = useNavigate(); + const hasScrolled = useRef(false); + + useEffect(() => { + if (hasScrolled.current) return; + const params = new URLSearchParams(search); + const section = params.get("section"); + + if (section) { + const targetElement = document.getElementById(section); + if (targetElement) { + targetElement.scrollIntoView({ behavior: "smooth" }); + hasScrolled.current = true; + navigate(pathname, { replace: true }); + return; + } + } + + scrollTop(); + }, []); + + return null; +}; + +export default ScrollTop; \ No newline at end of file diff --git a/web/src/hooks/useScrollTop.ts b/web/src/hooks/useScrollTop.ts new file mode 100644 index 00000000..004f8824 --- /dev/null +++ b/web/src/hooks/useScrollTop.ts @@ -0,0 +1,15 @@ +import { useContext } from "react"; +import { OverlayScrollContext } from "context/OverlayScrollContext"; + +export const useScrollTop = () => { + const osInstanceRef = useContext(OverlayScrollContext); + + const scrollTop = (smooth = false) => { + osInstanceRef?.current + ?.osInstance() + ?.elements() + ?.viewport.scroll({ top: 0, behavior: smooth ? "smooth" : "auto" }); + }; + + return scrollTop; +}; \ No newline at end of file diff --git a/web/src/pages/AttachmentDisplay/index.tsx b/web/src/pages/AttachmentDisplay/index.tsx index d387c211..c224291a 100644 --- a/web/src/pages/AttachmentDisplay/index.tsx +++ b/web/src/pages/AttachmentDisplay/index.tsx @@ -1,11 +1,15 @@ import React, { lazy, Suspense } from "react"; -import styled from "styled-components"; +import styled, { css } from "styled-components"; +import { responsiveSize } from "styles/responsiveSize"; +import { landscapeStyle, MAX_WIDTH_LANDSCAPE } from "styles/landscapeStyle"; import { useSearchParams } from "react-router-dom"; import NewTabIcon from "svgs/icons/new-tab.svg"; import Loader from "components/Loader"; +import ScrollTop from "components/ScrollTop"; +import { ExternalLink } from "components/ExternalLink"; import Header from "./Header"; @@ -13,22 +17,32 @@ const FileViewer = lazy(() => import("components/FileViewer")); const Container = styled.div` display: flex; - flex-direction: column; width: 100%; - gap: 8px; + background-color: ${({ theme }) => theme.lightBackground}; + padding: 32px 16px 40px; + max-width: ${MAX_WIDTH_LANDSCAPE}; + flex-direction: column; + margin: 0 auto; + + ${landscapeStyle( + () => css` + padding: 48px ${responsiveSize(0, 132)} 60px; + ` + )} `; const LoaderContainer = styled.div` - width: 100%; display: flex; justify-content: center; + width: 100%; `; -const NewTabInfo = styled.a` - align-self: flex-end; +const StyledExternalLink = styled(ExternalLink)` display: flex; - gap: 8px; align-items: center; + gap: 8px; + align-self: flex-end; + margin-bottom: 8px; `; const StyledNewTabIcon = styled(NewTabIcon)` @@ -39,16 +53,16 @@ const StyledNewTabIcon = styled(NewTabIcon)` const AttachmentDisplay: React.FC = () => { const [searchParams] = useSearchParams(); - const url = searchParams.get("url"); + return (
{url ? ( <> - + Open in new tab - + @@ -60,6 +74,7 @@ const AttachmentDisplay: React.FC = () => { ) : null} + ); }; From 75d36f722b6f1c07dfcda7e74459565fdea9f1bf Mon Sep 17 00:00:00 2001 From: kemuru <102478601+kemuru@users.noreply.github.com> Date: Fri, 18 Apr 2025 20:20:40 +0200 Subject: [PATCH 08/10] fix: hook fix --- web/src/pages/MyTransactions/TransactionDetails/index.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/src/pages/MyTransactions/TransactionDetails/index.tsx b/web/src/pages/MyTransactions/TransactionDetails/index.tsx index 6e6df50a..96303d08 100644 --- a/web/src/pages/MyTransactions/TransactionDetails/index.tsx +++ b/web/src/pages/MyTransactions/TransactionDetails/index.tsx @@ -32,7 +32,9 @@ const TransactionDetails: React.FC = () => { const { id } = useParams(); const { data: transactionDetails } = useTransactionDetailsQuery(id); const { data: escrowParameters } = useEscrowParametersQuery(); - const arbitrationCost = useReadKlerosCoreArbitrationCost(escrowParameters?.escrowParameters?.arbitratorExtraData); + const arbitrationCost = useReadKlerosCoreArbitrationCost({ + args: [escrowParameters?.escrowParameters?.arbitratorExtraData], + }); const nativeTokenSymbol = useNativeTokenSymbol(); const { tokenMetadata } = useTokenMetadata(transactionDetails?.escrow?.token); const erc20TokenSymbol = tokenMetadata?.symbol; @@ -88,6 +90,7 @@ const TransactionDetails: React.FC = () => { isPreview={false} feeTimeout={escrowParameters?.escrowParameters.feeTimeout} settlementTimeout={escrowParameters?.escrowParameters.settlementTimeout} + arbitrationCost={arbitrationCost?.data} {...{ status, token, @@ -96,7 +99,6 @@ const TransactionDetails: React.FC = () => { hasToPayFees, disputeRequest, resolvedEvents, - arbitrationCost, assetSymbol, transactionHash, }} From dccaebe35ff0a5f1b7557ebc02a5cbddf4165e0e Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Wed, 23 Apr 2025 12:41:16 +0100 Subject: [PATCH 09/10] fix: rolled back chai to v4 because v5 is ESM only --- contracts/package.json | 4 +-- yarn.lock | 71 +++++------------------------------------- 2 files changed, 9 insertions(+), 66 deletions(-) diff --git a/contracts/package.json b/contracts/package.json index 14d9ab6b..e36bb65c 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -58,12 +58,12 @@ "@nomiclabs/hardhat-solhint": "^4.0.1", "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^9.1.0", - "@types/chai": "^5.2.1", + "@types/chai": "^4.3.20", "@types/mocha": "^10.0.10", "@types/node": "^18.19.86", "@wagmi/cli": "^2.2.1", "abitype": "^1.0.8", - "chai": "^5.2.0", + "chai": "^4.5.0", "dotenv": "^16.4.5", "ethereumjs-util": "^7.1.5", "ethers": "^6.13.6", diff --git a/yarn.lock b/yarn.lock index d9c86379..28d1a098 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4964,12 +4964,12 @@ __metadata: "@openzeppelin/contracts": "npm:^5.3.0" "@typechain/ethers-v6": "npm:^0.5.1" "@typechain/hardhat": "npm:^9.1.0" - "@types/chai": "npm:^5.2.1" + "@types/chai": "npm:^4.3.20" "@types/mocha": "npm:^10.0.10" "@types/node": "npm:^18.19.86" "@wagmi/cli": "npm:^2.2.1" abitype: "npm:^1.0.8" - chai: "npm:^5.2.0" + chai: "npm:^4.5.0" dotenv: "npm:^16.4.5" ethereumjs-util: "npm:^7.1.5" ethers: "npm:^6.13.6" @@ -8169,12 +8169,10 @@ __metadata: languageName: node linkType: hard -"@types/chai@npm:^5.2.1": - version: 5.2.1 - resolution: "@types/chai@npm:5.2.1" - dependencies: - "@types/deep-eql": "npm:*" - checksum: 10/101fcbed19aaecf87163a4261fb0f078b4cede99bc9863d3a288a3d76bc5edf18d3772bbe9bc28cf60dd19be8265eeae1c5bbe735de829e5a6905e96b45a1339 +"@types/chai@npm:^4.3.20": + version: 4.3.20 + resolution: "@types/chai@npm:4.3.20" + checksum: 10/94fd87036fb63f62c79caf58ccaec88e23cc109e4d41607d83adc609acd6b24eabc345feb7850095a53f76f99c470888251da9bd1b90849c8b2b5a813296bb19 languageName: node linkType: hard @@ -8206,13 +8204,6 @@ __metadata: languageName: node linkType: hard -"@types/deep-eql@npm:*": - version: 4.0.2 - resolution: "@types/deep-eql@npm:4.0.2" - checksum: 10/249a27b0bb22f6aa28461db56afa21ec044fa0e303221a62dff81831b20c8530502175f1a49060f7099e7be06181078548ac47c668de79ff9880241968d43d0c - languageName: node - linkType: hard - "@types/dns-packet@npm:^5.6.5": version: 5.6.5 resolution: "@types/dns-packet@npm:5.6.5" @@ -10721,13 +10712,6 @@ __metadata: languageName: node linkType: hard -"assertion-error@npm:^2.0.1": - version: 2.0.1 - resolution: "assertion-error@npm:2.0.1" - checksum: 10/a0789dd882211b87116e81e2648ccb7f60340b34f19877dd020b39ebb4714e475eb943e14ba3e22201c221ef6645b7bfe10297e76b6ac95b48a9898c1211ce66 - languageName: node - linkType: hard - "ast-parents@npm:^0.0.1": version: 0.0.1 resolution: "ast-parents@npm:0.0.1" @@ -11914,7 +11898,7 @@ __metadata: languageName: node linkType: hard -"chai@npm:^4.3.4": +"chai@npm:^4.3.4, chai@npm:^4.5.0": version: 4.5.0 resolution: "chai@npm:4.5.0" dependencies: @@ -11929,19 +11913,6 @@ __metadata: languageName: node linkType: hard -"chai@npm:^5.2.0": - version: 5.2.0 - resolution: "chai@npm:5.2.0" - dependencies: - assertion-error: "npm:^2.0.1" - check-error: "npm:^2.1.1" - deep-eql: "npm:^5.0.1" - loupe: "npm:^3.1.0" - pathval: "npm:^2.0.0" - checksum: 10/2ce03671c159c6a567bf1912756daabdbb7c075f3c0078f1b59d61da8d276936367ee696dfe093b49e1479d9ba93a6074c8e55d49791dddd8061728cdcad249e - languageName: node - linkType: hard - "chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -12076,13 +12047,6 @@ __metadata: languageName: node linkType: hard -"check-error@npm:^2.1.1": - version: 2.1.1 - resolution: "check-error@npm:2.1.1" - checksum: 10/d785ed17b1d4a4796b6e75c765a9a290098cf52ff9728ce0756e8ffd4293d2e419dd30c67200aee34202463b474306913f2fcfaf1890641026d9fc6966fea27a - languageName: node - linkType: hard - "check-types@npm:^11.2.3": version: 11.2.3 resolution: "check-types@npm:11.2.3" @@ -13811,13 +13775,6 @@ __metadata: languageName: node linkType: hard -"deep-eql@npm:^5.0.1": - version: 5.0.2 - resolution: "deep-eql@npm:5.0.2" - checksum: 10/a529b81e2ef8821621d20a36959a0328873a3e49d393ad11f8efe8559f31239494c2eb889b80342808674c475802ba95b9d6c4c27641b9a029405104c1b59fcf - languageName: node - linkType: hard - "deep-extend@npm:^0.6.0, deep-extend@npm:~0.6.0": version: 0.6.0 resolution: "deep-extend@npm:0.6.0" @@ -20929,13 +20886,6 @@ __metadata: languageName: node linkType: hard -"loupe@npm:^3.1.0": - version: 3.1.3 - resolution: "loupe@npm:3.1.3" - checksum: 10/9e98c34daf0eba48ccc603595e51f2ae002110982d84879cf78c51de2c632f0c571dfe82ce4210af60c32203d06b443465c269bda925076fe6d9b612cc65c321 - languageName: node - linkType: hard - "lower-case-first@npm:^2.0.2": version: 2.0.2 resolution: "lower-case-first@npm:2.0.2" @@ -23431,13 +23381,6 @@ __metadata: languageName: node linkType: hard -"pathval@npm:^2.0.0": - version: 2.0.0 - resolution: "pathval@npm:2.0.0" - checksum: 10/b91575bf9cdf01757afd7b5e521eb8a0b874a49bc972d08e0047cfea0cd3c019f5614521d4bc83d2855e3fcc331db6817dfd533dd8f3d90b16bc76fad2450fc1 - languageName: node - linkType: hard - "pbkdf2@npm:^3.0.17, pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2": version: 3.1.2 resolution: "pbkdf2@npm:3.1.2" From a7f4b01b592bf28ce48d7c099a447fc6618fa8f2 Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Wed, 23 Apr 2025 20:15:10 +0100 Subject: [PATCH 10/10] fix: deployment-specific frontendUrl in dispute template --- contracts/scripts/setDisputeTemplate.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contracts/scripts/setDisputeTemplate.ts b/contracts/scripts/setDisputeTemplate.ts index 1936c62d..956de772 100644 --- a/contracts/scripts/setDisputeTemplate.ts +++ b/contracts/scripts/setDisputeTemplate.ts @@ -6,17 +6,20 @@ const parameters = { arbitrumSepoliaDevnet: { subgraphEndpoint: "https://gateway.thegraph.com/api/{{{graphApiKey}}}/subgraphs/id/3aZxYcZpZL5BuVhuUupqVrCV8VeNyZEvjmPXibyPHDFQ", + frontendUrl: "https://dev--kleros-escrow-v2.netlify.app/#/transactions/{{externalDisputeID}}", }, arbitrumSepoliaTestnet: { subgraphEndpoint: "TODO", + frontendUrl: "TODO", }, arbitrum: { subgraphEndpoint: "https://gateway.thegraph.com/api/{{{graphApiKey}}}/subgraphs/id/96vpnRJbRVkzF6usMNYMMoziSZEfSwGEDpXNi2h9WBSW", + frontendUrl: "https://escrow-v2.kleros.builders/#/transactions/{{externalDisputeID}}", }, }; -const disputeTemplateFn = (chainId: number, klerosCore: string) => `{ +const disputeTemplateFn = (chainId: number, klerosCore: string, frontendUrl: string) => `{ "$schema": "../NewDisputeTemplate.schema.json", "title": "Escrow dispute: {{escrowTitle}}", "description": "{{deliverableText}}", @@ -43,7 +46,7 @@ const disputeTemplateFn = (chainId: number, klerosCore: string) => `{ "label": "Transaction Terms", "uri": "{{{extraDescriptionUri}}}" }, - "frontendUrl": "https://escrow-v2.kleros.builders/#/transactions/{{externalDisputeID}}", + "frontendUrl": "${frontendUrl}", "arbitratorChainID": "${chainId}", "arbitratorAddress": "${klerosCore}", "metadata": { @@ -95,14 +98,14 @@ task("set-dispute-template", "Sets the dispute template").setAction(async (args, const { config, deployments } = hre; const { escrow, view, klerosCore } = await getContracts(hre); const networkName = await deployments.getNetworkName(); - const { subgraphEndpoint } = parameters[networkName]; + const { subgraphEndpoint, frontendUrl } = parameters[networkName]; const chainId = config.networks[networkName].chainId; if (!chainId || !klerosCore || !subgraphEndpoint) { throw new Error("Missing parameters"); } - const disputeTemplate = disputeTemplateFn(chainId, klerosCore.target.toString()); + const disputeTemplate = disputeTemplateFn(chainId, klerosCore.target.toString(), frontendUrl); console.log("New disputeTemplate", disputeTemplate); const mapping = mappingFn(subgraphEndpoint, view.target.toString());