From 6daa408ff68f64824adf13df31da6c37c7d72c0e Mon Sep 17 00:00:00 2001 From: Georgios Konstantopoulos Date: Wed, 28 Apr 2021 12:19:05 +0300 Subject: [PATCH] fix: update hardhat to use correct solc url (#668) * fix: update hardhat to use correct solc url https://github.com/nomiclabs/hardhat/issues/1332\#issuecomment-818212424 * fix(core-utils): revert sentry/node version to 6.2.5 so that it's compatible with pino-sentry 0.7.0 https://github.com/aandrewww/pino-sentry/pull/25 This was required because the hardhat upgrade removed any older versions of the dependency which were still around and could be used. * chore: add changeset * ci: allow tests to be run on demand --- .changeset/breezy-cows-kneel.md | 11 ++ .github/workflows/geth.yml | 1 + .github/workflows/integration.yml | 1 + .github/workflows/ts-packages.yml | 1 + integration-tests/package.json | 2 +- packages/batch-submitter/package.json | 2 +- packages/contracts/package.json | 2 +- packages/core-utils/package.json | 8 +- packages/data-transport-layer/package.json | 6 +- packages/hardhat-ovm/package.json | 2 +- packages/smock/package.json | 2 +- yarn.lock | 168 ++++++--------------- 12 files changed, 76 insertions(+), 130 deletions(-) create mode 100644 .changeset/breezy-cows-kneel.md diff --git a/.changeset/breezy-cows-kneel.md b/.changeset/breezy-cows-kneel.md new file mode 100644 index 000000000000..c6766a535ce1 --- /dev/null +++ b/.changeset/breezy-cows-kneel.md @@ -0,0 +1,11 @@ +--- +"@eth-optimism/integration-tests": patch +"@eth-optimism/batch-submitter": patch +"@eth-optimism/contracts": patch +"@eth-optimism/core-utils": patch +"@eth-optimism/data-transport-layer": patch +"@eth-optimism/hardhat-ovm": patch +"@eth-optimism/smock": patch +--- + +update hardhat versions so that solc is resolved correctly diff --git a/.github/workflows/geth.yml b/.github/workflows/geth.yml index adda793889e3..2183ba5b6ecd 100644 --- a/.github/workflows/geth.yml +++ b/.github/workflows/geth.yml @@ -14,6 +14,7 @@ on: branches: - master - '*rc' + workflow_dispatch: defaults: run: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4a30a2053555..727b3a72a923 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -6,6 +6,7 @@ on: - master - '*rc' pull_request: + workflow_dispatch: jobs: integration: diff --git a/.github/workflows/ts-packages.yml b/.github/workflows/ts-packages.yml index d4badcbbe2f5..e97bc92f2cf5 100644 --- a/.github/workflows/ts-packages.yml +++ b/.github/workflows/ts-packages.yml @@ -15,6 +15,7 @@ on: paths: - 'packages/**/*.sol' - 'packages/**/*.ts' + workflow_dispatch: jobs: test: diff --git a/integration-tests/package.json b/integration-tests/package.json index 198f3d6cef4e..5bd237947aca 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -25,7 +25,7 @@ "chai-as-promised": "^7.1.1", "ethereum-waffle": "^3.3.0", "ethers": "^5.0.32", - "hardhat": "^2.1.2", + "hardhat": "^2.2.1", "hardhat-gas-reporter": "^1.0.4", "mocha": "^8.3.1", "rimraf": "^3.0.2" diff --git a/packages/batch-submitter/package.json b/packages/batch-submitter/package.json index 8d80479f956f..b46befd10e27 100644 --- a/packages/batch-submitter/package.json +++ b/packages/batch-submitter/package.json @@ -54,7 +54,7 @@ "chai-as-promised": "^7.1.1", "ethereum-waffle": "3.0.0", "ganache-core": "^2.13.2", - "hardhat": "^2.1.1", + "hardhat": "^2.2.1", "mocha": "^6.1.4", "prettier": "^1.16.4", "rimraf": "^2.6.3", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 5e485640515c..a245505117c5 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -67,7 +67,7 @@ "dotenv": "^8.2.0", "ethereum-waffle": "^3.3.0", "ethers": "^5.0.31", - "hardhat": "^2.0.8", + "hardhat": "^2.2.1", "hardhat-deploy": "^0.7.4", "hardhat-gas-reporter": "^1.0.4", "lodash": "^4.17.20", diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index 9a1e0354cc9e..4b056e69e019 100644 --- a/packages/core-utils/package.json +++ b/packages/core-utils/package.json @@ -31,13 +31,13 @@ }, "dependencies": { "@ethersproject/abstract-provider": "^5.0.9", - "@sentry/node": "^6.3.0", + "@sentry/node": "^6.2.5", "@types/pino-multi-stream": "^5.1.1", "ethers": "^5.0.31", "lodash": "^4.17.21", - "pino": "^6.11.1", - "prom-client": "^13.1.0", + "pino": "^6.11.3", "pino-multi-stream": "^5.3.0", - "pino-sentry": "^0.7.0" + "pino-sentry": "^0.7.0", + "prom-client": "^13.1.0" } } diff --git a/packages/data-transport-layer/package.json b/packages/data-transport-layer/package.json index 5a8fd5182383..28eb06f7b86b 100644 --- a/packages/data-transport-layer/package.json +++ b/packages/data-transport-layer/package.json @@ -22,8 +22,8 @@ "@eth-optimism/contracts": "^0.2.6", "@eth-optimism/core-utils": "^0.3.1", "@ethersproject/providers": "^5.0.21", - "@sentry/node": "^6.2.5", - "@sentry/tracing": "^6.2.5", + "@sentry/node": "^6.3.1", + "@sentry/tracing": "^6.3.1", "@types/express": "^4.17.11", "bcfg": "^0.1.6", "browser-or-node": "^1.3.0", @@ -45,7 +45,7 @@ "@types/rimraf": "^3.0.0", "chai": "^4.3.4", "chai-as-promised": "^7.1.1", - "hardhat": "^2.0.9", + "hardhat": "^2.2.1", "mocha": "^8.3.2", "pino-pretty": "^4.7.1", "rimraf": "^3.0.2", diff --git a/packages/hardhat-ovm/package.json b/packages/hardhat-ovm/package.json index 9bbf74984b1c..1c274ee776a2 100644 --- a/packages/hardhat-ovm/package.json +++ b/packages/hardhat-ovm/package.json @@ -19,6 +19,6 @@ }, "devDependencies": { "@types/mocha": "^8.2.2", - "hardhat": "^2.1.2" + "hardhat": "^2.2.1" } } diff --git a/packages/smock/package.json b/packages/smock/package.json index 714fe9d0aaa8..01dbebba084b 100644 --- a/packages/smock/package.json +++ b/packages/smock/package.json @@ -19,7 +19,7 @@ "@nomiclabs/ethereumjs-vm": "^4", "@nomiclabs/hardhat-ethers": "^2", "ethers": "^5", - "hardhat": "^2" + "hardhat": "^2.2.1" }, "dependencies": { "@eth-optimism/core-utils": "^0.3.0", diff --git a/yarn.lock b/yarn.lock index 0ce23d4cccb4..f6cfced37c94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1564,7 +1564,7 @@ "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" -"@nomiclabs/ethereumjs-vm@4.2.2", "@nomiclabs/ethereumjs-vm@^4.2.2": +"@nomiclabs/ethereumjs-vm@^4.2.2": version "4.2.2" resolved "https://registry.yarnpkg.com/@nomiclabs/ethereumjs-vm/-/ethereumjs-vm-4.2.2.tgz#2f8817113ca0fb6c44c1b870d0a809f0e026a6cc" integrity sha512-8WmX94mMcJaZ7/m7yBbyuS6B+wuOul+eF+RY9fBpGhNaUpyMR/vFIcDojqcWQ4Yafe1tMKY5LDu2yfT4NZgV4Q== @@ -1829,15 +1829,15 @@ "@sentry/utils" "6.2.5" tslib "^1.9.3" -"@sentry/core@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.3.0.tgz#3b8db24918a00c0b77f1663fc6d9be925f66bb3e" - integrity sha512-voot/lJ9gRXB6bx6tVqbEbD6jOd4Sx6Rfmm6pzfpom9C0q+fjIZTatTLq8GdXj8DzxaH1MBDSwtaq/eC3NqYpA== +"@sentry/core@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.3.1.tgz#5e32ca919c9be30fec0bb3125a556bc711584bdf" + integrity sha512-aVuvVbaehGeN86jZlLDGGkhEtprdOtB6lvYLfGy40Dj1Tkh2mGWE550QsRXAXAqYvQzIYwQR23r6m3o8FujgVg== dependencies: - "@sentry/hub" "6.3.0" - "@sentry/minimal" "6.3.0" - "@sentry/types" "6.3.0" - "@sentry/utils" "6.3.0" + "@sentry/hub" "6.3.1" + "@sentry/minimal" "6.3.1" + "@sentry/types" "6.3.1" + "@sentry/utils" "6.3.1" tslib "^1.9.3" "@sentry/hub@5.30.0": @@ -1858,13 +1858,13 @@ "@sentry/utils" "6.2.5" tslib "^1.9.3" -"@sentry/hub@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.3.0.tgz#4225b3b0f31fe47f24d80753b257a4b57de5d651" - integrity sha512-lAnW3Om66t9IR+t1wya1NpOF9lGbvYG6Ca8wxJJGJ1t2PxKwyxpZKzRx0q8M1QFhlZ5cETCzxmM7lBEZ4QVCBg== +"@sentry/hub@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.3.1.tgz#dda07888a82d1c48bbefa00205bfa9d035691f07" + integrity sha512-2er+OeVlsdVZkhl9kXQAANwgjwoCdM1etK2iFuhzX8xkMaJlAuZLyQInv2U1BbXBlIfWjvzRM8B95hCWvVrR3Q== dependencies: - "@sentry/types" "6.3.0" - "@sentry/utils" "6.3.0" + "@sentry/types" "6.3.1" + "@sentry/utils" "6.3.1" tslib "^1.9.3" "@sentry/minimal@5.30.0": @@ -1885,13 +1885,13 @@ "@sentry/types" "6.2.5" tslib "^1.9.3" -"@sentry/minimal@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.3.0.tgz#e64d87c92a4676a11168672a96589f46985f2b22" - integrity sha512-ZdPUwdPQkaKroy67NkwQRqmnfKyd/C1OyouM9IqYKyBjAInjOijwwc/Rd91PMHalvCOGfp1scNZYbZ+YFs/qQQ== +"@sentry/minimal@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.3.1.tgz#38f71c77e8820555effb6e868336d4f5672018cd" + integrity sha512-0eN9S7HvXsCQEjX/qXHTMgvSb3mwrnZEWS9Qz/Bz5ig9pEGXKgJ1om5NTTHVHhXqd3wFCjdvIo6slufLHoCtSw== dependencies: - "@sentry/hub" "6.3.0" - "@sentry/types" "6.3.0" + "@sentry/hub" "6.3.1" + "@sentry/types" "6.3.1" tslib "^1.9.3" "@sentry/node@^5.18.1": @@ -1924,16 +1924,16 @@ lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/node@^6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.3.0.tgz#8d55f32930d531b9a2a3b594754392925b1e3816" - integrity sha512-n3RemuJsMpSbrIopJ2TxeECwQy/Dvho59SePAVQzK0s6dpG3Ak6YWQSh1XESbFbgLi4KzkbMdeBgznmmEbZPgg== - dependencies: - "@sentry/core" "6.3.0" - "@sentry/hub" "6.3.0" - "@sentry/tracing" "6.3.0" - "@sentry/types" "6.3.0" - "@sentry/utils" "6.3.0" +"@sentry/node@^6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.3.1.tgz#0f81a0e352fa5b3e36bcc53adb6e26cd214c637d" + integrity sha512-D0r603fdNwUPkwvy0IcQaUSTafl+7lrOytiO5dfdLdlkhtTcwivwENc/n8ER8GOC2zpIvYOEIJvzP4PGL85khw== + dependencies: + "@sentry/core" "6.3.1" + "@sentry/hub" "6.3.1" + "@sentry/tracing" "6.3.1" + "@sentry/types" "6.3.1" + "@sentry/utils" "6.3.1" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" @@ -1950,7 +1950,7 @@ "@sentry/utils" "5.30.0" tslib "^1.9.3" -"@sentry/tracing@6.2.5", "@sentry/tracing@^6.2.5": +"@sentry/tracing@6.2.5": version "6.2.5" resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.2.5.tgz#3f5dadfdccdb5c1fb2eef68458c7c34329b0a34a" integrity sha512-j/hM0BoHxfrNLxPeEJ5Vq4R34hO/TOHMEpLR3FdnunBXbsmjoKMMygIkPxnpML5XWtvukAehbwpDXldwMYz83w== @@ -1961,15 +1961,15 @@ "@sentry/utils" "6.2.5" tslib "^1.9.3" -"@sentry/tracing@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.3.0.tgz#5da2ce67bb5f9cf4f3aa9b6dff06089478f0c501" - integrity sha512-3UNGgQOrDKBoDqLc4vt+0n27Zv3lbNEoCbBydq4IvGfuYq7ozWMsaTcelsotMsd4ckDuOEh8V/nJTqrDjvL76g== +"@sentry/tracing@6.3.1", "@sentry/tracing@^6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.3.1.tgz#3b96aabf4d9cebadfec070c006db79801a68ee24" + integrity sha512-qveDmoWsXy9qLEblZJwJ1OU/zZRlEd/q7Jhd0Hnwlob8Ci96huABEbYyGdJs18BKVHEFU3gSdVfvrikUE/W17g== dependencies: - "@sentry/hub" "6.3.0" - "@sentry/minimal" "6.3.0" - "@sentry/types" "6.3.0" - "@sentry/utils" "6.3.0" + "@sentry/hub" "6.3.1" + "@sentry/minimal" "6.3.1" + "@sentry/types" "6.3.1" + "@sentry/utils" "6.3.1" tslib "^1.9.3" "@sentry/types@5.30.0": @@ -1982,10 +1982,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.2.5.tgz#34b75285b149e0b9bc5fd54fcc2c445d978c7f2e" integrity sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w== -"@sentry/types@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.3.0.tgz#919cc1870f34b7126546c77e3c695052795d3add" - integrity sha512-xWyCYDmFPjS5ex60kxOOHbHEs4vs00qHbm0iShQfjl4OSg9S2azkcWofDmX8Xbn0FSOUXgdPCjNJW1B0bPVhCA== +"@sentry/types@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.3.1.tgz#af3b54728b29f633f38fbe51b8c10e3834fbc158" + integrity sha512-BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw== "@sentry/utils@5.30.0": version "5.30.0" @@ -2003,12 +2003,12 @@ "@sentry/types" "6.2.5" tslib "^1.9.3" -"@sentry/utils@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.0.tgz#e28645b6d4acd03a478e58bfe112ea02f81e94a0" - integrity sha512-NZzw4oLelgvCsVBG2e+ZtFtaBvgA7rZYtcGFbZTphhAlYoJ6JMCQUzYk0iwJK79yR1quh510x4UE0jynvvToWg== +"@sentry/utils@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.1.tgz#6d8e691139b5b49d8c655ad1dcaf2cb3ff0d0b03" + integrity sha512-cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA== dependencies: - "@sentry/types" "6.3.0" + "@sentry/types" "6.3.1" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -6909,57 +6909,6 @@ hardhat-gas-reporter@^1.0.4: eth-gas-reporter "^0.2.20" sha1 "^1.1.1" -hardhat@^2.0.8, hardhat@^2.0.9, hardhat@^2.1.1, hardhat@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.1.2.tgz#a2128b71b0fb216ffc978c85a2030835b4e306ea" - integrity sha512-42iOheDsDl6Gr7sBfpA0S+bQUIcXSDEUrrqmnFEcBHx9qBoQad3s212y2ODmmkdLt+PqqTM+Mq8N3bZDTdjoLg== - dependencies: - "@nomiclabs/ethereumjs-vm" "4.2.2" - "@sentry/node" "^5.18.1" - "@solidity-parser/parser" "^0.11.0" - "@types/bn.js" "^4.11.5" - "@types/lru-cache" "^5.1.0" - abort-controller "^3.0.0" - adm-zip "^0.4.16" - ansi-escapes "^4.3.0" - chalk "^2.4.2" - chokidar "^3.4.0" - ci-info "^2.0.0" - debug "^4.1.1" - enquirer "^2.3.0" - env-paths "^2.2.0" - eth-sig-util "^2.5.2" - ethereum-cryptography "^0.1.2" - ethereumjs-abi "^0.6.8" - ethereumjs-account "^3.0.0" - ethereumjs-block "^2.2.2" - ethereumjs-common "^1.5.0" - ethereumjs-tx "^2.1.2" - ethereumjs-util "^6.2.0" - find-up "^2.1.0" - fp-ts "1.19.3" - fs-extra "^7.0.1" - glob "^7.1.3" - immutable "^4.0.0-rc.12" - io-ts "1.10.4" - lodash "^4.17.11" - merkle-patricia-tree "3.0.0" - mnemonist "^0.38.0" - mocha "^7.1.2" - node-fetch "^2.6.0" - qs "^6.7.0" - raw-body "^2.4.1" - resolve "1.17.0" - semver "^6.3.0" - slash "^3.0.0" - solc "0.7.3" - source-map-support "^0.5.13" - stacktrace-parser "^0.1.10" - "true-case-path" "^2.2.1" - tsort "0.0.1" - uuid "^3.3.2" - ws "^7.2.1" - hardhat@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.2.1.tgz#bef0031b994e3f60a88d428f2097195c58cf9ed2" @@ -10382,7 +10331,7 @@ pino-std-serializers@^3.1.0: resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz#b56487c402d882eb96cd67c257868016b61ad671" integrity sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg== -pino@^6.0.0: +pino@^6.0.0, pino@^6.11.3: version "6.11.3" resolved "https://registry.yarnpkg.com/pino/-/pino-6.11.3.tgz#0c02eec6029d25e6794fdb6bbea367247d74bc29" integrity sha512-drPtqkkSf0ufx2gaea3TryFiBHdNIdXKf5LN0hTM82SXI4xVIve2wLwNg92e1MT6m3jASLu6VO7eGY6+mmGeyw== @@ -10394,18 +10343,6 @@ pino@^6.0.0: quick-format-unescaped "^4.0.3" sonic-boom "^1.0.2" -pino@^6.11.1: - version "6.11.2" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.11.2.tgz#2f3d119c526651aab4ec3d280844785d52d0b690" - integrity sha512-bmzxwbrIPxQUlAuMkF4PWVErUGERU4z37HazlhflKFg08crsNE3fACGN6gPwg5xtKOK47Ux5cZm8YCuLV4wWJg== - dependencies: - fast-redact "^3.0.0" - fast-safe-stringify "^2.0.7" - flatstr "^1.0.12" - pino-std-serializers "^3.1.0" - quick-format-unescaped "4.0.1" - sonic-boom "^1.0.2" - pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -10742,11 +10679,6 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -quick-format-unescaped@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz#437a5ea1a0b61deb7605f8ab6a8fd3858dbeb701" - integrity sha512-RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A== - quick-format-unescaped@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.3.tgz#6d6b66b8207aa2b35eef12be1421bb24c428f652"