From c861131337f93d37957638e8aec1e390999e575c Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Tue, 26 Apr 2022 14:15:11 +0200 Subject: [PATCH 1/2] Use slither 0.8.3 in CI Use the latest version of slither 0.8.3 --- .github/workflows/contracts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contracts.yaml b/.github/workflows/contracts.yaml index 43fbd7c8..c5d9922c 100644 --- a/.github/workflows/contracts.yaml +++ b/.github/workflows/contracts.yaml @@ -228,7 +228,7 @@ jobs: - name: Install Slither env: - SLITHER_VERSION: 0.8.0 + SLITHER_VERSION: 0.8.3 run: pip3 install slither-analyzer==$SLITHER_VERSION - name: Install dependencies From 13b101256d95503e7fe5a41b41b7e788660dd5b7 Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Tue, 26 Apr 2022 14:36:33 +0200 Subject: [PATCH 2/2] Upgrade dependencies to openzeppelin packages I upgraded dependencies to OpenZeppelin's packages as this was suggested in one of the slither's issues as possible fix to slither's crash: https://github.com/crytic/slither/issues/1140 --- package.json | 6 +++--- yarn.lock | 29 +++++++++++++++-------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index ffa2cad8..ed83607f 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@keep-network/prettier-config-keep": "github:keep-network/prettier-config-keep#d6ec02e", "@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-waffle": "^2.0.1", - "@openzeppelin/hardhat-upgrades": "^1.12.0", + "@openzeppelin/hardhat-upgrades": "^1.17.0", "@tenderly/hardhat-tenderly": "^1.0.12", "@types/chai": "^4.2.22", "@types/mocha": "^9.0.0", @@ -61,8 +61,8 @@ }, "dependencies": { "@keep-network/keep-core": ">1.8.0-dev <1.8.0-pre", - "@openzeppelin/contracts": "^4.5", - "@openzeppelin/contracts-upgradeable": "^4.5", + "@openzeppelin/contracts": "^4.5.0", + "@openzeppelin/contracts-upgradeable": "^4.5.2", "@thesis/solidity-contracts": "github:thesis/solidity-contracts#4985bcf" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 0fe0f118..7ce3760d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -617,28 +617,29 @@ "@types/sinon-chai" "^3.2.3" "@types/web3" "1.0.19" -"@openzeppelin/contracts-upgradeable@^4.5": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.1.tgz#dc354082460eb34f5833afdecfab46538b208c4f" - integrity sha512-xcKycsSyFauIGMhSeeTJW/Jzz9jZUJdiFNP9Wo/9VhMhw8t5X0M92RY6x176VfcIWsxURMHFWOJVTlFA78HI/w== +"@openzeppelin/contracts-upgradeable@^4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.2.tgz#90d9e47bacfd8693bfad0ac8a394645575528d05" + integrity sha512-xgWZYaPlrEOQo3cBj97Ufiuv79SPd8Brh4GcFYhPgb6WvAq4ppz8dWKL6h+jLAK01rUqMRp/TS9AdXgAeNvCLA== -"@openzeppelin/contracts@^4.1.0", "@openzeppelin/contracts@^4.5": +"@openzeppelin/contracts@^4.1.0", "@openzeppelin/contracts@^4.5.0": version "4.5.0" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz#3fd75d57de172b3743cdfc1206883f56430409cc" integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA== -"@openzeppelin/hardhat-upgrades@^1.12.0": - version "1.14.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/hardhat-upgrades/-/hardhat-upgrades-1.14.0.tgz#a84c4088061959164468ae10a2ae53faaa3163fd" - integrity sha512-dWLC+cgawHcZ5AbEblA3nTrBpcG9J7Z7J5UmM7qdsc/Yc97USJjXfcD6uYOQ+PhyFVBY0Ni83WGVll48d4QRWQ== +"@openzeppelin/hardhat-upgrades@^1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/hardhat-upgrades/-/hardhat-upgrades-1.17.0.tgz#24ea0f366c3b2df985263cf8b1b796afd04d7e13" + integrity sha512-GNxR3/3fCKQsFpBi/r+5ib6U81UM9KCypmcOQxuCkVp9JKJ80/3hQdg1R+AQku/dlnhutPsfkCokH2LZFc5mNA== dependencies: - "@openzeppelin/upgrades-core" "^1.12.0" + "@openzeppelin/upgrades-core" "^1.14.1" chalk "^4.1.0" + proper-lockfile "^4.1.1" -"@openzeppelin/upgrades-core@^1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.12.0.tgz#847aeeba38780040672f8288795c824a4c9d97e6" - integrity sha512-gu/ijQW+RJqGlniNkpNmiwBus3R1cuJNT0/MEJASWRFNr4Qvn0d7LZONaAkhnvlBpxdiiPenMcFIrRlwvZL4iw== +"@openzeppelin/upgrades-core@^1.14.1": + version "1.14.2" + resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.14.2.tgz#1acf6560dbe42b5e68fdffe6e6979b90fa33bb56" + integrity sha512-JkrMcsB0v6vwX+fObY+y51L3tD3BcLjNpPnKkgtsEOC1Umwt6WzvI8Gq2brmNOzFLNQqeX2xySiJTGvypqUQow== dependencies: bn.js "^5.1.2" cbor "^8.0.0"