From beceb1a47e770dc771b9d25f5b6e8ffb46da3fd4 Mon Sep 17 00:00:00 2001 From: wighawag Date: Wed, 17 Jan 2024 12:29:23 +0000 Subject: [PATCH] fix viem integration --- common/package.json | 2 +- contracts/package.json | 2 +- indexer/package.json | 2 +- package.json | 2 +- pnpm-lock.yaml | 139 ++++++++++++++++++++++------------------- web/package.json | 6 +- 6 files changed, 83 insertions(+), 70 deletions(-) diff --git a/common/package.json b/common/package.json index 3163197..f8849e4 100644 --- a/common/package.json +++ b/common/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "ldenv": "^0.3.9", - "prettier": "^3.2.3", + "prettier": "^3.2.4", "tsup": "^8.0.1", "typescript": "^5.3.3" }, diff --git a/contracts/package.json b/contracts/package.json index a6f1c3f..e4dd1d3 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -11,7 +11,7 @@ "hardhat-rocketh": "^1.0.4", "jolly-roger-common": "workspace:*", "ldenv": "^0.3.9", - "prettier": "^3.2.3", + "prettier": "^3.2.4", "prettier-plugin-solidity": "^1.3.1", "rocketh": "^0.7.4", "rocketh-deploy": "^1.0.5", diff --git a/indexer/package.json b/indexer/package.json index ffc84e1..cb3cdcd 100644 --- a/indexer/package.json +++ b/indexer/package.json @@ -15,7 +15,7 @@ "ethereum-indexer-cli": "^0.6.24", "ethereum-indexer-server": "^0.6.27", "ldenv": "^0.3.9", - "prettier": "^3.2.3", + "prettier": "^3.2.4", "tsup": "^8.0.1", "typescript": "^5.3.3", "wait-on": "^7.2.0" diff --git a/package.json b/package.json index 37362e9..c9dcde7 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "devDependencies": { "ask-env": "^0.0.1", "ldenv": "^0.3.9", - "prettier": "^3.2.3", + "prettier": "^3.2.4", "syncpack": "^12.3.0", "vitepress": "1.0.0-rc.39" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ad80ec..e62aa8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: ^0.3.9 version: 0.3.9 prettier: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^3.2.4 + version: 3.2.4 syncpack: specifier: ^12.3.0 version: 12.3.0 @@ -34,8 +34,8 @@ importers: specifier: ^0.3.9 version: 0.3.9 prettier: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^3.2.4 + version: 3.2.4 tsup: specifier: ^8.0.1 version: 8.0.1(typescript@5.3.3) @@ -67,11 +67,11 @@ importers: specifier: ^0.3.9 version: 0.3.9 prettier: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^3.2.4 + version: 3.2.4 prettier-plugin-solidity: specifier: ^1.3.1 - version: 1.3.1(prettier@3.2.3) + version: 1.3.1(prettier@3.2.4) rocketh: specifier: ^0.7.4 version: 0.7.4(typescript@5.3.3) @@ -143,8 +143,8 @@ importers: specifier: ^0.3.9 version: 0.3.9 prettier: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^3.2.4 + version: 3.2.4 tsup: specifier: ^8.0.1 version: 8.0.1(typescript@5.3.3) @@ -201,20 +201,20 @@ importers: version: 2.1.1(typescript@5.3.3) web3-connection: specifier: ^0.1.12 - version: 0.1.12(svelte@4.2.8) + version: 0.1.12(svelte@4.2.9) web3-connection-viem: - specifier: ^0.1.0 - version: 0.1.0(viem@2.1.1) + specifier: ^0.1.3 + version: 0.1.3(viem@2.1.1) devDependencies: '@sveltejs/adapter-static': specifier: ^3.0.0 version: 3.0.1(@sveltejs/kit@2.3.3) '@sveltejs/kit': specifier: ^2.0.0 - version: 2.3.3(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) + version: 2.3.3(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.11) '@sveltejs/vite-plugin-svelte': specifier: ^3.0.0 - version: 3.0.1(svelte@4.2.8)(vite@5.0.11) + version: 3.0.1(svelte@4.2.9)(vite@5.0.11) '@tailwindcss/forms': specifier: ^0.5.7 version: 0.5.7(tailwindcss@3.4.1) @@ -243,23 +243,23 @@ importers: specifier: ^5.0.2 version: 5.0.2(postcss@8.4.33) prettier: - specifier: ^3.2.3 - version: 3.2.3 + specifier: ^3.2.4 + version: 3.2.4 prettier-plugin-svelte: specifier: ^3.1.2 - version: 3.1.2(prettier@3.2.3)(svelte@4.2.8) + version: 3.1.2(prettier@3.2.4)(svelte@4.2.9) pwag: specifier: 0.2.0 version: 0.2.0 svelte: - specifier: ^4.2.8 - version: 4.2.8 + specifier: ^4.2.9 + version: 4.2.9 svelte-check: specifier: ^3.6.3 - version: 3.6.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.8) + version: 3.6.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.9) svelte-preprocess: specifier: ^5.1.3 - version: 5.1.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.8)(typescript@5.3.3) + version: 5.1.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.9)(typescript@5.3.3) tailwindcss: specifier: ^3.4.1 version: 3.4.1 @@ -2261,10 +2261,10 @@ packages: peerDependencies: '@sveltejs/kit': ^2.0.0 dependencies: - '@sveltejs/kit': 2.3.3(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) + '@sveltejs/kit': 2.3.3(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.11) dev: true - /@sveltejs/kit@2.3.3(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11): + /@sveltejs/kit@2.3.3(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.11): resolution: {integrity: sha512-RYsOjZ7pFvZqPfL+4kNdL428kyJSy12Wk7BT+1XoUkwNe5F47z81n8kvm/2SfkD2NNXVKE9QBfhtiNJsssNWvQ==} engines: {node: '>=18.13'} hasBin: true @@ -2274,7 +2274,7 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.3 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.11) + '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.9)(vite@5.0.11) '@types/cookie': 0.6.0 cookie: 0.6.0 devalue: 4.3.2 @@ -2286,12 +2286,12 @@ packages: sade: 1.8.1 set-cookie-parser: 2.6.0 sirv: 2.0.4 - svelte: 4.2.8 + svelte: 4.2.9 tiny-glob: 0.2.9 vite: 5.0.11 dev: true - /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11): + /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.11): resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==} engines: {node: ^18.0.0 || >=20} peerDependencies: @@ -2299,28 +2299,28 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.11) - debug: 4.3.4(supports-color@8.1.1) - svelte: 4.2.8 + '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.9)(vite@5.0.11) + debug: 4.3.4 + svelte: 4.2.9 vite: 5.0.11 transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.8)(vite@5.0.11): + /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.9)(vite@5.0.11): resolution: {integrity: sha512-CGURX6Ps+TkOovK6xV+Y2rn8JKa8ZPUHPZ/NKgCxAmgBrXReavzFl8aOSCj3kQ1xqT7yGJj53hjcV/gqwDAaWA==} engines: {node: ^18.0.0 || >=20} peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) - debug: 4.3.4(supports-color@8.1.1) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.11) + debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.5 - svelte: 4.2.8 - svelte-hmr: 0.15.3(svelte@4.2.8) + svelte: 4.2.9 + svelte-hmr: 0.15.3(svelte@4.2.9) vite: 5.0.11 vitefu: 0.2.5(vite@5.0.11) transitivePeerDependencies: @@ -2825,7 +2825,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -3063,8 +3063,8 @@ packages: - debug dev: true - /axobject-query@3.2.1: - resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==} + /axobject-query@4.0.0: + resolution: {integrity: sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==} dependencies: dequal: 2.0.3 @@ -3816,6 +3816,18 @@ packages: ms: 2.1.3 dev: true + /debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + dev: true + /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -5315,7 +5327,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -5334,7 +5346,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -5889,7 +5901,7 @@ packages: /koa-route@3.2.0: resolution: {integrity: sha512-8FsuWw/L+CUWJfpgN6vrlYUDNTheEinG8Zkm97GyuLJNyWjCVUs9p10Ih3jTIWwmDVQcz6827l0RKadAS5ibqA==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 methods: 1.1.2 path-to-regexp: 1.8.0 transitivePeerDependencies: @@ -5913,7 +5925,7 @@ packages: resolution: {integrity: sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==} engines: {node: '>= 8'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 http-errors: 1.8.1 resolve-path: 1.4.0 transitivePeerDependencies: @@ -5939,7 +5951,7 @@ packages: content-disposition: 0.5.4 content-type: 1.0.5 cookies: 0.8.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 delegates: 1.0.0 depd: 2.0.0 destroy: 1.2.0 @@ -7406,30 +7418,30 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-solidity@1.3.1(prettier@3.2.3): + /prettier-plugin-solidity@1.3.1(prettier@3.2.4): resolution: {integrity: sha512-MN4OP5I2gHAzHZG1wcuJl0FsLS3c4Cc5494bbg+6oQWBPuEamjwDvmGfFMZ6NFzsh3Efd9UUxeT7ImgjNH4ozA==} engines: {node: '>=16'} peerDependencies: prettier: '>=2.3.0' dependencies: '@solidity-parser/parser': 0.17.0 - prettier: 3.2.3 + prettier: 3.2.4 semver: 7.5.4 solidity-comments-extractor: 0.0.8 dev: true - /prettier-plugin-svelte@3.1.2(prettier@3.2.3)(svelte@4.2.8): + /prettier-plugin-svelte@3.1.2(prettier@3.2.4)(svelte@4.2.9): resolution: {integrity: sha512-7xfMZtwgAWHMT0iZc8jN4o65zgbAQ3+O32V6W7pXrqNvKnHnkoyQCGCbKeUyXKZLbYE0YhFRnamfxfkEGxm8qA==} peerDependencies: prettier: ^3.0.0 svelte: ^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0 dependencies: - prettier: 3.2.3 - svelte: 4.2.8 + prettier: 3.2.4 + svelte: 4.2.9 dev: true - /prettier@3.2.3: - resolution: {integrity: sha512-QNhUTBq+mqt1oH1dTfY3phOKNhcDdJkfttHI6u0kj7M2+c+7fmNKlgh2GhnHiqMcbxJ+a0j2igz/2jfl9QKLuw==} + /prettier@3.2.4: + resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} engines: {node: '>=14'} hasBin: true dev: true @@ -8575,7 +8587,7 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check@3.6.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.8): + /svelte-check@3.6.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.9): resolution: {integrity: sha512-Q2nGnoysxUnB9KjnjpQLZwdjK62DHyW6nuH/gm2qteFnDk0lCehe/6z8TsIvYeKjC6luKaWxiNGyOcWiLLPSwA==} hasBin: true peerDependencies: @@ -8587,8 +8599,8 @@ packages: import-fresh: 3.3.0 picocolors: 1.0.0 sade: 1.8.1 - svelte: 4.2.8 - svelte-preprocess: 5.1.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.8)(typescript@5.3.3) + svelte: 4.2.9 + svelte-preprocess: 5.1.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.9)(typescript@5.3.3) typescript: 5.3.3 transitivePeerDependencies: - '@babel/core' @@ -8602,16 +8614,16 @@ packages: - sugarss dev: true - /svelte-hmr@0.15.3(svelte@4.2.8): + /svelte-hmr@0.15.3(svelte@4.2.9): resolution: {integrity: sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: ^3.19.0 || ^4.0.0 dependencies: - svelte: 4.2.8 + svelte: 4.2.9 dev: true - /svelte-preprocess@5.1.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.8)(typescript@5.3.3): + /svelte-preprocess@5.1.3(postcss-load-config@5.0.2)(postcss@8.4.33)(svelte@4.2.9)(typescript@5.3.3): resolution: {integrity: sha512-xxAkmxGHT+J/GourS5mVJeOXZzne1FR5ljeOUAMXUkfEhkLEllRreXpbl3dIYJlcJRfL1LO1uIAPpBpBfiqGPw==} engines: {node: '>= 16.0.0', pnpm: ^8.0.0} requiresBuild: true @@ -8656,20 +8668,21 @@ packages: postcss-load-config: 5.0.2(postcss@8.4.33) sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 4.2.8 + svelte: 4.2.9 typescript: 5.3.3 dev: true - /svelte@4.2.8: - resolution: {integrity: sha512-hU6dh1MPl8gh6klQZwK/n73GiAHiR95IkFsesLPbMeEZi36ydaXL/ZAb4g9sayT0MXzpxyZjR28yderJHxcmYA==} + /svelte@4.2.9: + resolution: {integrity: sha512-hsoB/WZGEPFXeRRLPhPrbRz67PhP6sqYgvwcAs+gWdSQSvNDw+/lTeUJSWe5h2xC97Fz/8QxAOqItwBzNJPU8w==} engines: {node: '>=16'} dependencies: '@ampproject/remapping': 2.2.1 '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.21 + '@types/estree': 1.0.5 acorn: 8.11.3 aria-query: 5.3.0 - axobject-query: 3.2.1 + axobject-query: 4.0.0 code-red: 1.0.4 css-tree: 2.3.1 estree-walker: 3.0.3 @@ -9505,21 +9518,21 @@ packages: defaults: 1.0.4 dev: true - /web3-connection-viem@0.1.0(viem@2.1.1): - resolution: {integrity: sha512-vUnfpyZWz8yBc1GE4nlAv9sYT9iXx629szpMjTvoOXqAOCK01SOEFcgsPH1Jwo3Wjm+xgp89VaZ2RmprIYCVvw==} + /web3-connection-viem@0.1.3(viem@2.1.1): + resolution: {integrity: sha512-5T6toK0+nkMIhFMu0fqK3sck/s2Ifk6am33517pr7Ko3C3j0S5L793NxCxaKAJvX5kIVgZMBh049aQT0JVj2OA==} peerDependencies: viem: ^2.1.1 dependencies: viem: 2.1.1(typescript@5.3.3) dev: false - /web3-connection@0.1.12(svelte@4.2.8): + /web3-connection@0.1.12(svelte@4.2.9): resolution: {integrity: sha512-URqGtPMWakxCMQCN9o14CdMGAaBEkqz3VnYuyoW0o5kkja+AI5MOkB9RaunIi6Hy/1ABdopXhJMN1tOBV8mSew==} peerDependencies: svelte: ^4.0.0 dependencies: named-logs: 0.2.2 - svelte: 4.2.8 + svelte: 4.2.9 dev: false /web3-utils@1.10.3: diff --git a/web/package.json b/web/package.json index adadbb7..1e4d993 100644 --- a/web/package.json +++ b/web/package.json @@ -17,10 +17,10 @@ "ipfs-gateway-emulator": "4.2.1-ipfs.2", "postcss": "^8.4.33", "postcss-load-config": "^5.0.2", - "prettier": "^3.2.3", + "prettier": "^3.2.4", "prettier-plugin-svelte": "^3.1.2", "pwag": "0.2.0", - "svelte": "^4.2.8", + "svelte": "^4.2.9", "svelte-check": "^3.6.3", "svelte-preprocess": "^5.1.3", "tailwindcss": "^3.4.1", @@ -45,7 +45,7 @@ "theme-change": "^2.5.0", "viem": "^2.1.1", "web3-connection": "^0.1.12", - "web3-connection-viem": "^0.1.0" + "web3-connection-viem": "^0.1.3" }, "scripts": { "prepare": "pwag static/icon.svg src/web-config.json",