Skip to content

Commit 1c36e73

Browse files
committed
chore: remove overrides, move packages at solidity-contracts to devDependencies
1 parent ad7b34a commit 1c36e73

File tree

4 files changed

+68
-399
lines changed

4 files changed

+68
-399
lines changed

package.json

-22
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,5 @@
4040
"devDependencies": {
4141
"@changesets/cli": "^2.26.2",
4242
"@fuel-ts/forc": "0.71.1"
43-
},
44-
"pnpm": {
45-
"overrides": {
46-
"graphql": ">=16.8.1",
47-
"semver": ">=5.7.2",
48-
"axios": ">=1.6.0",
49-
"undici": ">=5.26.2",
50-
"get-func-name": ">=2.0.1",
51-
"flat@<5.0.1": ">=5.0.1",
52-
"debug@>=3.2.0 <3.2.7": ">=3.2.7",
53-
"@openzeppelin/contracts-upgradeable@>=4.0.0 <4.9.3": ">=4.9.3",
54-
"@openzeppelin/contracts@>=4.0.0 <4.9.3": ">=4.9.3",
55-
"@openzeppelin/contracts-upgradeable@>=4.7.0 <4.9.2": ">=4.9.2",
56-
"@openzeppelin/contracts@>=4.7.0 <4.9.2": ">=4.9.2",
57-
"@openzeppelin/contracts-upgradeable@>=4.3.0 <4.9.1": ">=4.9.1",
58-
"@openzeppelin/contracts@>=4.3.0 <4.9.1": ">=4.9.1",
59-
"node-fetch@<2.6.7": ">=2.6.7",
60-
"word-wrap@<1.2.4": ">=1.2.4",
61-
"tough-cookie@<4.1.3": ">=4.1.3",
62-
"minimatch@<3.0.5": ">=3.0.5",
63-
"follow-redirects@<1.15.4": ">=1.15.4"
64-
}
6543
}
6644
}

packages/solidity-contracts/hardhat.config.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { config as dotEnvConfig } from 'dotenv';
22
import type { HardhatUserConfig } from 'hardhat/types';
3-
// import '@nomicfoundation/hardhat-toolbox'; // Uncomment this line and the project fails
4-
// import '@nomicfoundation/hardhat-network-helpers';
5-
// import '@openzeppelin/hardhat-upgrades';
3+
import '@nomicfoundation/hardhat-ethers';
4+
import '@nomicfoundation/hardhat-network-helpers';
5+
import '@nomicfoundation/hardhat-verify';
6+
import '@typechain/hardhat';
7+
import '@openzeppelin/hardhat-upgrades';
68
import 'hardhat-deploy';
79
import 'solidity-coverage';
810

@@ -70,6 +72,9 @@ const config: HardhatUserConfig = {
7072
chainId: 11155111,
7173
},
7274
},
75+
typechain: {
76+
outDir: 'typechain',
77+
},
7378
etherscan: {
7479
apiKey: ETHERSCAN_API_KEY,
7580
},

packages/solidity-contracts/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,14 @@
3939
"devDependencies": {
4040
"@fuel-contracts/merkle-sol": "^0.1.4",
4141
"@fuel-ts/merkle": "^0.21.2",
42+
"@nomicfoundation/hardhat-ethers": "^3.0.5",
4243
"@nomicfoundation/hardhat-network-helpers": "^1.0.10",
43-
"@nomicfoundation/hardhat-toolbox": "3.0.0",
44+
"@nomicfoundation/hardhat-verify": "1.1.1",
4445
"@openzeppelin/contracts": "^4.8.3",
4546
"@openzeppelin/contracts-upgradeable": "^4.8.3",
4647
"@openzeppelin/hardhat-upgrades": "^2.5.1",
48+
"@typechain/ethers-v6": "^0.5.1",
49+
"@typechain/hardhat": "^9.1.0",
4750
"@types/chai": "^4.3.4",
4851
"@types/express": "^4.17.14",
4952
"@types/lodash": "^4.14.202",

0 commit comments

Comments
 (0)