From 211b3c796d3573df16739d7e4287956a5a191fbd Mon Sep 17 00:00:00 2001 From: wshino Date: Thu, 26 Sep 2024 12:44:58 +0900 Subject: [PATCH] Update version of @zk-email/contracts and accountabstraction --- README.md | 9 ++++++ packages/contracts/package.json | 4 +-- packages/contracts/remappings.txt | 4 +-- yarn.lock | 53 ++++++++++++++++--------------- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 71f43a7c..79717e44 100644 --- a/README.md +++ b/README.md @@ -157,3 +157,12 @@ mdbook serve
☆ Built using [zk-email](https://github.com/zkemail/zk-email-verify) ☆ + +NOTE: + +If you get an error with `yarn install`, try to install python-setuptools + +``` +# For macOS +brew install python-setuptools +``` \ No newline at end of file diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 2d8bff80..e4b90e3f 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -13,8 +13,8 @@ "@safe-global/safe-contracts": "1.4.1", "@uniswap/v3-core": "https://github.com/Uniswap/v3-core#0.8", "@uniswap/v3-periphery": "https://github.com/Uniswap/v3-periphery.git", - "@zk-email/contracts": "^4.1.0", - "accountabstraction": "eth-infinitism/account-abstraction#v0.6.0", + "@zk-email/contracts": "^6.1.5", + "accountabstraction": "eth-infinitism/account-abstraction#v0.7.0", "solady": "^0.0.123", "solidity-stringutils": "https://github.com/Arachnid/solidity-stringutils.git" }, diff --git a/packages/contracts/remappings.txt b/packages/contracts/remappings.txt index 5284b4c1..5119fa70 100644 --- a/packages/contracts/remappings.txt +++ b/packages/contracts/remappings.txt @@ -1,5 +1,5 @@ -@openzeppelin/=node_modules/@openzeppelin -@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable +@openzeppelin/=../../node_modules/@openzeppelin +@openzeppelin/contracts-upgradeable/=../../node_modules/@openzeppelin/contracts-upgradeable @zk-email/=../../node_modules/@zk-email @uniswap/=../../node_modules/@uniswap forge-std/=../../node_modules/forge-std/src diff --git a/yarn.lock b/yarn.lock index 12ec421f..48af2475 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1423,11 +1423,6 @@ graphql-import-node "^0.0.5" js-yaml "^4.1.0" -"@gnosis.pm/safe-contracts@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-contracts/-/safe-contracts-1.3.0.tgz#316741a7690d8751a1f701538cfc9ec80866eedc" - integrity sha512-1p+1HwGvxGUVzVkFjNzglwHrLNA67U/axP0Ct85FzzH8yhGJb4t9jDjPYocVMzLorDoWAfKicGy1akPY9jXRVw== - "@graphprotocol/graph-cli@0.68.3": version "0.68.3" resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.68.3.tgz#1a7b3d8da34b00f3c3f56d36c11abf584524df31" @@ -1973,11 +1968,6 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.2-solc-0.7.tgz#38f4dbab672631034076ccdf2f3201fab1726635" integrity sha512-W6QmqgkADuFcTLzHL8vVoNBtkwjvQRpYIAom7KiUNoLKghyx3FgH0GBjt8NRvigV1ZmMOBllvE1By1C+bi8WpA== -"@openzeppelin/contracts@^4.2.0", "@openzeppelin/contracts@^4.9.3": - version "4.9.6" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.6.tgz#2a880a24eb19b4f8b25adc2a5095f2aa27f39677" - integrity sha512-xSmezSupL+y9VkHZJGDoCBpmnB2ogM13ccaYDWqJTfS3dbuHkgjuwDFUmaFauBCboQMGB/S5UqUl2y54X99BmA== - "@openzeppelin/contracts@^5.0.0": version "5.0.2" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210" @@ -2235,6 +2225,13 @@ dependencies: "@types/node" "*" +"@types/debug@^4.1.12": + version "4.1.12" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917" + integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ== + dependencies: + "@types/ms" "*" + "@types/express-serve-static-core@^4.17.33": version "4.19.5" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz#218064e321126fcf9048d1ca25dd2465da55d9c6" @@ -2334,6 +2331,11 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4" integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== +"@types/ms@*": + version "0.7.34" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" + integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== + "@types/node@*", "@types/node@>=13.7.0", "@types/node@^20.2.5": version "20.14.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.12.tgz#129d7c3a822cb49fc7ff661235f19cfefd422b49" @@ -2495,12 +2497,12 @@ "@zk-email/zk-regex-circom" "^2.1.0" circomlib "^2.0.5" -"@zk-email/contracts@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@zk-email/contracts/-/contracts-4.1.0.tgz#f2baa42f81a844449b1b7359a448ed70d503eedd" - integrity sha512-5cFgx1kpAPL0Pl5wUb2SA3qaIgYpbp5jjonuYH268BaspvyqSoFS77/UVX+4yjbOQtZmrTntaYXNaseghLLlXw== +"@zk-email/contracts@^6.1.5": + version "6.1.5" + resolved "https://registry.yarnpkg.com/@zk-email/contracts/-/contracts-6.1.5.tgz#979c2aaa30cdcdb7433ff37d74c396df0cb60107" + integrity sha512-1RW3dpYGBQXjmIlcTGMtYsux7FQoR1MezA0D0pssrNEaCO2CuQd6oAxJLpbCxFQWPbujLKn8PiEVcjP+eiGvVw== dependencies: - "@openzeppelin/contracts" "^4.9.3" + "@openzeppelin/contracts" "^5.0.0" dotenv "^16.3.1" "@zk-email/ether-email-auth-circom@0.0.2-preview": @@ -2584,21 +2586,22 @@ accepts@^1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -accountabstraction@eth-infinitism/account-abstraction#v0.6.0: - version "0.6.0" - resolved "https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/abff2aca61a8f0934e533d0d352978055fddbd96" +accountabstraction@eth-infinitism/account-abstraction#v0.7.0: + version "0.7.0" + resolved "https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7af70c8993a6f42973f520ae0752386a5032abe7" dependencies: - "@gnosis.pm/safe-contracts" "^1.3.0" "@nomiclabs/hardhat-etherscan" "^2.1.6" - "@openzeppelin/contracts" "^4.2.0" + "@openzeppelin/contracts" "^5.0.0" "@thehubbleproject/bls" "^0.5.1" "@typechain/hardhat" "^2.3.0" + "@types/debug" "^4.1.12" "@types/mocha" "^9.0.0" + debug "^4.3.4" ethereumjs-util "^7.1.0" ethereumjs-wallet "^1.0.1" hardhat-deploy "^0.11.23" hardhat-deploy-ethers "^0.3.0-beta.11" - solidity-coverage "^0.8.2" + solidity-coverage "^0.8.4" source-map-support "^0.5.19" table "^6.8.0" typescript "^4.3.5" @@ -8235,10 +8238,10 @@ solidity-comments-extractor@^0.0.8: resolved "https://registry.yarnpkg.com/solidity-comments-extractor/-/solidity-comments-extractor-0.0.8.tgz#f6e148ab0c49f30c1abcbecb8b8df01ed8e879f8" integrity sha512-htM7Vn6LhHreR+EglVMd2s+sZhcXAirB1Zlyrv5zBuTxieCvjfnRpd7iZk75m/u6NOlEyQ94C6TWbBn2cY7w8g== -solidity-coverage@^0.8.2: - version "0.8.12" - resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.12.tgz#c4fa2f64eff8ada7a1387b235d6b5b0e6c6985ed" - integrity sha512-8cOB1PtjnjFRqOgwFiD8DaUsYJtVJ6+YdXQtSZDrLGf8cdhhh8xzTtGzVTGeBf15kTv0v7lYPJlV/az7zLEPJw== +solidity-coverage@^0.8.4: + version "0.8.13" + resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.13.tgz#8eeada2e82ae19d25568368aa782a2baad0e0ce7" + integrity sha512-RiBoI+kF94V3Rv0+iwOj3HQVSqNzA9qm/qDP1ZDXK5IX0Cvho1qiz8hAXTsAo6KOIUeP73jfscq0KlLqVxzGWA== dependencies: "@ethersproject/abi" "^5.0.9" "@solidity-parser/parser" "^0.18.0"