From cf1e99ec9347249f53c4f8a1366cc094c47c0313 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Thu, 1 Sep 2022 11:34:19 +0300 Subject: [PATCH 1/2] Update SDK versions --- local-setup-testing/package.json | 6 +-- local-setup-testing/yarn.lock | 80 +++++++++++++++++--------------- 2 files changed, 45 insertions(+), 41 deletions(-) diff --git a/local-setup-testing/package.json b/local-setup-testing/package.json index d5a76dc..29978df 100644 --- a/local-setup-testing/package.json +++ b/local-setup-testing/package.json @@ -4,8 +4,8 @@ "main": "index.js", "license": "MIT", "devDependencies": { - "@matterlabs/hardhat-zksync-deploy": "^0.2.0", - "@matterlabs/hardhat-zksync-solc": "^0.3.2", + "@matterlabs/hardhat-zksync-deploy": "^0.4.0", + "@matterlabs/hardhat-zksync-solc": "^0.3.7", "@types/chai": "^4.3.0", "@types/mocha": "^9.1.0", "chai": "^4.3.6", @@ -14,7 +14,7 @@ "mocha": "^10.0.0", "ts-node": "^10.5.0", "typescript": "^4.5.5", - "zksync-web3": "^0.7.8" + "zksync-web3": "^0.8.1" }, "scripts": { "test": "NODE_ENV=test hardhat test" diff --git a/local-setup-testing/yarn.lock b/local-setup-testing/yarn.lock index 12cf535..a145c84 100644 --- a/local-setup-testing/yarn.lock +++ b/local-setup-testing/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@balena/dockerignore@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d" + integrity sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q== + "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" @@ -423,21 +428,20 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.0" -"@matterlabs/hardhat-zksync-deploy@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-deploy/-/hardhat-zksync-deploy-0.2.0.tgz#1adf9dc194d02d79ba94aa9eb8377d67b2f71188" - integrity sha512-S3EcY7yN4UPcD8pMVrtTEfezZbM2+gzt5wNuF1/+e9Yrg5zOcAhdSqllVIdDF7HxetpAUdrmBaqMmXy88UTSOQ== +"@matterlabs/hardhat-zksync-deploy@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-deploy/-/hardhat-zksync-deploy-0.4.0.tgz#8a6ef1faf7d91cf2b32072eeaa7c7332fb4c27b1" + integrity sha512-r/xp+CL1+qVLNGoSehUe4u80QZRG8e4WEnhJ1JuJSxzOaoivqUDFblf8Q/TQkdFPrilBqpgTJzcPazDsWeH0SQ== dependencies: - glob "^7.1.3" + glob "^8.0.1" -"@matterlabs/hardhat-zksync-solc@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.3.2.tgz#67cdac01d51b5d137673312376ad5b4a6f794ac4" - integrity sha512-PYhIJfsqdsU4Px/XGvvmgKI921VRb4Rjm6rNPsjHYh9bw9TKdUgCYLfx5DF36I7+t2pH4e5KST8GwvDKwqkOTg== +"@matterlabs/hardhat-zksync-solc@^0.3.7": + version "0.3.7" + resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-0.3.7.tgz#1215e8558d7de35cecb875a28e02df697bd63cdb" + integrity sha512-fhqCC+31G4ccW//ENyKzSpCfTTh3D5jeO1jPeDhgvw+0DMC3W1iOvAc+7FXpz1kMJmcQYNLQyMDV71xXTREAMw== dependencies: "@nomiclabs/hardhat-docker" "^2.0.0" - dockerode "^3.3.1" - semver "^7.3.7" + dockerode "^3.3.4" "@metamask/eth-sig-util@^4.0.0": version "4.0.1" @@ -1242,11 +1246,12 @@ dockerode@^2.5.8: docker-modem "^1.0.8" tar-fs "~1.16.3" -dockerode@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.1.tgz#74f66e239e092e7910e2beae6322d35c44b08cdc" - integrity sha512-AS2mr8Lp122aa5n6d99HkuTNdRV1wkkhHwBdcnY6V0+28D3DSYwhxAk85/mM9XwD3RMliTxyr63iuvn5ZblFYQ== +dockerode@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.4.tgz#875de614a1be797279caa9fe27e5637cf0e40548" + integrity sha512-3EUwuXnCU+RUlQEheDjmBE0B7q66PV9Rw5NiH1sXwINq0M9c5ERP9fxgkw36ZHOtzf4AGEEYySnkx/sACC9EgQ== dependencies: + "@balena/dockerignore" "^1.0.2" docker-modem "^3.0.0" tar-fs "~2.0.1" @@ -1554,6 +1559,17 @@ glob@7.2.0, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" @@ -1961,13 +1977,6 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - lru_map@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" @@ -2065,6 +2074,13 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" @@ -2474,13 +2490,6 @@ semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - serialize-javascript@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" @@ -2895,11 +2904,6 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" @@ -2943,7 +2947,7 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -zksync-web3@^0.7.8: - version "0.7.9" - resolved "https://registry.yarnpkg.com/zksync-web3/-/zksync-web3-0.7.9.tgz#fbb9a17f4b297c0fb9361de2a0d85ff2aac5becc" - integrity sha512-B0pitKvEQGJuWkY2UWjXrL1YgHghXEoDaq6acVZnB62TRF099GV58Fzi7Fnqt+Nw14A7Wc9iJ2AHD4GBTLFgkg== +zksync-web3@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/zksync-web3/-/zksync-web3-0.8.1.tgz#db289d8f6caf61f4d5ddc471fa3448d93208dc14" + integrity sha512-1A4aHPQ3MyuGjpv5X/8pVEN+MdZqMjfVmiweQSRjOlklXYu65wT9BGEOtCmMs5d3gIvLp4ssfTeuR5OCKOD2kw== From 8a5a01d595f5c4f6b70329c04f168ebdf4ce0e7a Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Thu, 1 Sep 2022 13:49:31 +0300 Subject: [PATCH 2/2] Update hardhat config file --- local-setup-testing/hardhat.config.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/local-setup-testing/hardhat.config.ts b/local-setup-testing/hardhat.config.ts index 6ce9892..c024243 100644 --- a/local-setup-testing/hardhat.config.ts +++ b/local-setup-testing/hardhat.config.ts @@ -11,14 +11,12 @@ const zkSyncDeploy = process.env.NODE_ENV == 'test' ? { module.exports = { zksolc: { - version: "0.1.0", + version: "1.1.5", compilerSource: "docker", settings: { - optimizer: { - enabled: true, - }, experimental: { dockerImage: "matterlabs/zksolc", + tag: 'v1.1.5' }, }, },