From 91145e9cef7f356270953b36fd3a01b017db47e5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 3 Nov 2023 12:47:20 +0100 Subject: [PATCH 1/3] Adding .git-blame-ignore-revs file --- core/.git-blame-ignore-revs | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 core/.git-blame-ignore-revs diff --git a/core/.git-blame-ignore-revs b/core/.git-blame-ignore-revs new file mode 100644 index 000000000..e69de29bb From d11592efae0b6b21d391937461ac6d0e692e203f Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 3 Nov 2023 12:53:37 +0100 Subject: [PATCH 2/3] Bumping up versions across selected dependencies --- core/package.json | 15 +++++++-------- core/yarn.lock | 41 ++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/core/package.json b/core/package.json index 2b5649c0b..4681e2f68 100644 --- a/core/package.json +++ b/core/package.json @@ -34,17 +34,16 @@ "@nomicfoundation/hardhat-toolbox": "^3.0.0", "@nomicfoundation/hardhat-verify": "^1.0.0", "@nomiclabs/hardhat-etherscan": "^3.1.7", - "@nomiclabs/hardhat-waffle": "^2.0.6", "@openzeppelin/hardhat-upgrades": "^2.3.3", "@thesis-co/eslint-config": "^0.6.1", - "@typechain/ethers-v6": "^0.4.0", - "@typechain/hardhat": "^8.0.0", + "@typechain/ethers-v6": "^0.5.1", + "@typechain/hardhat": "^9.1.0", "@types/chai": "^4.2.0", "@types/mocha": ">=9.1.0", "@types/node": ">=16.0.0", - "chai": "^4.2.0", + "chai": "^4.3.10", "eslint": "^8.51.0", - "ethers": "^6.4.0", + "ethers": "^6.8.0", "hardhat": "^2.18.2", "hardhat-deploy": "^0.11.43", "hardhat-gas-reporter": "^1.0.8", @@ -53,8 +52,8 @@ "solhint": "^3.6.2", "solhint-config-keep": "github:keep-network/solhint-config-keep", "solidity-coverage": "^0.8.0", - "ts-node": ">=8.0.0", - "typechain": "^8.1.0", - "typescript": ">=4.5.0" + "ts-node": "^10.9.1", + "typechain": "^8.3.2", + "typescript": "^5.2.2" } } diff --git a/core/yarn.lock b/core/yarn.lock index e2d8e3206..cf702692a 100644 --- a/core/yarn.lock +++ b/core/yarn.lock @@ -874,11 +874,6 @@ table "^6.8.0" undici "^5.14.0" -"@nomiclabs/hardhat-waffle@^2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-waffle/-/hardhat-waffle-2.0.6.tgz#d11cb063a5f61a77806053e54009c40ddee49a54" - integrity sha512-+Wz0hwmJGSI17B+BhU/qFRZ1l6/xMW82QGXE/Gi+WTmwgJrQefuBs1lIf7hzQ1hLk6hpkvb/zwcNkpVKRYTQYg== - "@openzeppelin/defender-admin-client@^1.48.0": version "1.49.0" resolved "https://registry.yarnpkg.com/@openzeppelin/defender-admin-client/-/defender-admin-client-1.49.0.tgz#ed07318ccba10ac8a8a33cf594fc18b7ab5889f9" @@ -1132,18 +1127,18 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== -"@typechain/ethers-v6@^0.4.0": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@typechain/ethers-v6/-/ethers-v6-0.4.3.tgz#badd99f88d5a1f1a2f42590f298e20cc62618e59" - integrity sha512-TrxBsyb4ryhaY9keP6RzhFCviWYApcLCIRMPyWaKp2cZZrfaM3QBoxXTnw/eO4+DAY3l+8O0brNW0WgeQeOiDA== +"@typechain/ethers-v6@^0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@typechain/ethers-v6/-/ethers-v6-0.5.1.tgz#42fe214a19a8b687086c93189b301e2b878797ea" + integrity sha512-F+GklO8jBWlsaVV+9oHaPh5NJdd6rAKN4tklGfInX1Q7h0xPgVLP39Jl3eCulPB5qexI71ZFHwbljx4ZXNfouA== dependencies: lodash "^4.17.15" ts-essentials "^7.0.1" -"@typechain/hardhat@^8.0.0": - version "8.0.3" - resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-8.0.3.tgz#a114825f130405bbb8e535314003733b7ce3f91c" - integrity sha512-MytSmJJn+gs7Mqrpt/gWkTCOpOQ6ZDfRrRT2gtZL0rfGe4QrU4x9ZdW15fFbVM/XTa+5EsKiOMYXhRABibNeng== +"@typechain/hardhat@^9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-9.1.0.tgz#6985015f01dfb37ef2ca8a29c742d05890351ddc" + integrity sha512-mtaUlzLlkqTlfPwB3FORdejqBskSnh+Jl8AIJGjXNAQfRQ4ofHADPl1+oU7Z3pAJzmZbUXII8MhOLQltcHgKnA== dependencies: fs-extra "^9.1.0" @@ -1975,7 +1970,7 @@ chai-as-promised@^7.1.1: dependencies: check-error "^1.0.2" -chai@^4.2.0: +chai@^4.3.10: version "4.3.10" resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384" integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g== @@ -2927,10 +2922,10 @@ ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" -ethers@^6.4.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.8.0.tgz#0a26f57e96fd697cefcfcef464e0c325689d1daf" - integrity sha512-zrFbmQRlraM+cU5mE4CZTLBurZTs2gdp2ld0nG/f3ecBK+x6lZ69KSxBqZ4NjclxwfTxl5LeNufcBbMsTdY53Q== +ethers@^6.8.0: + version "6.8.1" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.8.1.tgz#ee2a1a39b5f62a13678f90ccd879175391d0a2b4" + integrity sha512-iEKm6zox5h1lDn6scuRWdIdFJUCGg3+/aQWu0F4K0GVyEZiktFkqrJbRjTn1FlYEPz7RKA707D6g5Kdk6j7Ljg== dependencies: "@adraffy/ens-normalize" "1.10.0" "@noble/curves" "1.2.0" @@ -5344,9 +5339,9 @@ solc@0.7.3: semver "^5.5.0" tmp "0.0.33" -"solhint-config-keep@github:keep-network/solhint-config-keep": +"solhint-config-thesis@github:thesis/solhint-config": version "0.1.0" - resolved "https://codeload.github.com/keep-network/solhint-config-keep/tar.gz/5e1751e58c0f1c507305ffc8c7f6c58047657ada" + resolved "https://codeload.github.com/thesis/solhint-config/tar.gz/159587cd6103f21aaa7fbadc17a06717a51b5b42" solhint@^3.6.2: version "3.6.2" @@ -5716,7 +5711,7 @@ ts-essentials@^7.0.1: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38" integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ== -ts-node@>=8.0.0: +ts-node@^10.9.1: version "10.9.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== @@ -5809,7 +5804,7 @@ type-fest@^0.7.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== -typechain@^8.1.0: +typechain@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.3.2.tgz#1090dd8d9c57b6ef2aed3640a516bdbf01b00d73" integrity sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q== @@ -5869,7 +5864,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@>=4.5.0: +typescript@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== From c7b9feec8cfe8360d5699a16b0c1fc740ab22302 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 3 Nov 2023 12:55:30 +0100 Subject: [PATCH 3/3] Pointing solhint config at thesis/solhint-config --- core/.solhint.json | 6 ++---- core/package.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/.solhint.json b/core/.solhint.json index 474c9ec09..7afe6405c 100644 --- a/core/.solhint.json +++ b/core/.solhint.json @@ -1,7 +1,5 @@ { - "extends": "keep", + "extends": "thesis", "plugins": [], - "rules": { - "func-visibility": ["error", { "ignoreConstructors": true }] - } + "rules": {} } diff --git a/core/package.json b/core/package.json index 4681e2f68..570eebfbf 100644 --- a/core/package.json +++ b/core/package.json @@ -50,7 +50,7 @@ "prettier": "^3.0.3", "prettier-plugin-solidity": "^1.1.3", "solhint": "^3.6.2", - "solhint-config-keep": "github:keep-network/solhint-config-keep", + "solhint-config-thesis": "github:thesis/solhint-config", "solidity-coverage": "^0.8.0", "ts-node": "^10.9.1", "typechain": "^8.3.2",