Skip to content

Commit

Permalink
RM and update many NPM deps (#12625)
Browse files Browse the repository at this point in the history
* rm openzeppelin/hardhat-upgrades

* bump patches and fix split test splits

* replace hardhat-etherscan with hardhat-verify

* bump hardhat-ethers

* rm hardhat-ignore-warnings

* rm hardhat-contract-sizer and hardhat-gas-reporter

* rm rlp

* reduce test runners by 1

* undo rm ignore warning
  • Loading branch information
RensR authored Mar 28, 2024
1 parent 6531e34 commit b3c70c6
Show file tree
Hide file tree
Showing 6 changed files with 323 additions and 1,221 deletions.
17 changes: 4 additions & 13 deletions contracts/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,13 @@
"type": "solidity",
"basePath": "./contracts/test/",
"splits": [
{
"dir": "cross-version",
"numOfSplits": 1
},
{
"dir": "v0.8",
"numOfSplits": 6,
"numOfSplits": 5,
"slowTests": [
"Cron",
"CronUpkeep",
"VRFSubscriptionBalanceMonitor",
"EthBalanceMonitor",
"KeeperRegistrar",
"KeeperRegistry1_2",
"KeeperRegistry1_3",
"KeeperRegistry2_0",
"CronUpkeepFactory",
"AutomationRegistry2_2",
"AutomationRegistry2_3",
"KeeperRegistry2_1"
]
}
Expand Down
16 changes: 2 additions & 14 deletions contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import '@nomiclabs/hardhat-ethers'
import '@nomiclabs/hardhat-etherscan'
import '@nomicfoundation/hardhat-ethers'
import '@nomicfoundation/hardhat-verify'
import '@nomiclabs/hardhat-waffle'
import '@openzeppelin/hardhat-upgrades'
import '@typechain/hardhat'
import 'hardhat-abi-exporter'
import 'hardhat-contract-sizer'
import 'hardhat-gas-reporter'
import 'hardhat-ignore-warnings'
import { subtask } from 'hardhat/config'
import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from 'hardhat/builtin-tasks/task-names'

Expand Down Expand Up @@ -99,18 +95,10 @@ let config = {
},
},
},
contractSizer: {
alphaSort: true,
runOnCompile: false,
disambiguatePaths: false,
},
mocha: {
timeout: 150000,
forbidOnly: Boolean(process.env.CI),
},
gasReporter: {
enabled: Boolean(process.env.REPORT_GAS),
},
warnings: !process.env.HIDE_WARNINGS,
}

Expand Down
26 changes: 11 additions & 15 deletions contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,40 +37,36 @@
"@ethersproject/bignumber": "~5.7.0",
"@ethersproject/contracts": "~5.7.0",
"@ethersproject/providers": "~5.7.2",
"@nomicfoundation/hardhat-ethers": "^3.0.5",
"@nomicfoundation/hardhat-network-helpers": "^1.0.9",
"@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-etherscan": "^3.1.7",
"@nomicfoundation/hardhat-verify": "^2.0.5",
"@nomiclabs/hardhat-waffle": "2.0.6",
"@openzeppelin/hardhat-upgrades": "1.28.0",
"@typechain/ethers-v5": "^7.2.0",
"@typechain/hardhat": "^7.0.0",
"@types/cbor": "5.0.1",
"@types/chai": "^4.3.11",
"@types/chai": "^4.3.14",
"@types/debug": "^4.1.12",
"@types/deep-equal-in-any-order": "^1.0.3",
"@types/mocha": "^10.0.6",
"@types/node": "^16.18.80",
"@types/node": "^16.18.91",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"abi-to-sol": "^0.6.6",
"cbor": "^5.2.0",
"chai": "^4.3.10",
"debug": "^4.3.4",
"deep-equal-in-any-order": "^2.0.6",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"deep-equal-in-any-order": "^2.0.6",
"eslint-plugin-prettier": "^5.1.3",
"ethereum-waffle": "^3.4.4",
"ethers": "~5.7.2",
"hardhat": "~2.19.2",
"hardhat": "~2.20.1",
"hardhat-abi-exporter": "^2.10.1",
"hardhat-contract-sizer": "^2.10.0",
"hardhat-gas-reporter": "^1.0.9",
"hardhat-ignore-warnings": "^0.2.6",
"moment": "^2.29.4",
"moment": "^2.30.1",
"prettier": "^3.2.5",
"prettier-plugin-solidity": "1.3.1",
"rlp": "^2.2.7",
"solhint": "^4.5.2",
"solhint-plugin-chainlink-solidity": "git+https://github.com/smartcontractkit/chainlink-solhint-rules.git#v1.2.1",
"solhint-plugin-prettier": "^0.1.0",
Expand All @@ -79,12 +75,12 @@
"typescript": "^5.4.3"
},
"dependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "~2.26.2",
"@eth-optimism/contracts": "0.6.0",
"@scroll-tech/contracts": "0.1.0",
"@openzeppelin/contracts": "4.9.3",
"@openzeppelin/contracts-upgradeable": "4.9.3",
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "~2.26.2",
"semver": "^7.5.4"
"@scroll-tech/contracts": "0.1.0",
"semver": "^7.6.0"
}
}
Loading

0 comments on commit b3c70c6

Please sign in to comment.