Skip to content

Commit 587e587

Browse files
committed
Merge branch 'hardhat-viem@npm-2.40.3-wagmi(fac1221)' into hardhat-chai-matchers-ether-v6-21729dc
2 parents f23b4a0 + fac1221 commit 587e587

File tree

28 files changed

+11317
-43
lines changed

28 files changed

+11317
-43
lines changed

.github/workflows/test-slow-imports-rule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install
3333
run: pnpm install --frozen-lockfile --prefer-offline
3434
- name: Add slow import
35-
run: echo 'import "lodash";' >> src/internal/constants.ts
35+
run: echo 'import "lodash";' >> src/internal/core/config/config-resolution.ts
3636
- name: Build
3737
run: pnpm build
3838
- name: Run eslint

config/eslint/constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports.slowImportsCommonIgnoredModules = [
77
"source-map-support/register",
88
"@nomicfoundation/hardhat-ethers",
99
"hardhat/common",
10+
"hardhat/common/bigInt",
1011
"hardhat/config",
1112
"hardhat/plugins",
1213
"hardhat/types",

docs/src/content/hardhat-runner/docs/advanced/migrating-from-hardhat-waffle.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ Follow these steps to migrate your project to Hardhat Toolbox.
1717
:::tab{value="npm 7+"}
1818

1919
```
20-
npm uninstall @nomiclabs/hardhat-waffle ethereum-waffle @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan chai ethers hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v5 @ethersproject/abi @ethersproject/providers
20+
npm uninstall @nomiclabs/hardhat-waffle ethereum-waffle @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan chai@4 ethers hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v5 @ethersproject/abi @ethersproject/providers
2121
```
2222

2323
:::
2424

2525
:::tab{value="npm 6"}
2626

2727
```
28-
npm uninstall @nomiclabs/hardhat-waffle ethereum-waffle @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan chai ethers hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v5 @ethersproject/abi @ethersproject/providers
28+
npm uninstall @nomiclabs/hardhat-waffle ethereum-waffle @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan chai@4 ethers hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v5 @ethersproject/abi @ethersproject/providers
2929
```
3030

3131
:::
@@ -55,15 +55,15 @@ Follow these steps to migrate your project to Hardhat Toolbox.
5555
:::tab{value="npm 6"}
5656

5757
```
58-
npm install --save-dev @nomicfoundation/hardhat-toolbox @nomicfoundation/hardhat-network-helpers @nomicfoundation/hardhat-chai-matchers @nomicfoundation/hardhat-ethers @nomicfoundation/hardhat-verify chai ethers hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v6
58+
npm install --save-dev @nomicfoundation/hardhat-toolbox @nomicfoundation/hardhat-network-helpers @nomicfoundation/hardhat-chai-matchers @nomicfoundation/hardhat-ethers @nomicfoundation/hardhat-verify chai@4 ethers hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v6
5959
```
6060

6161
:::
6262

6363
:::tab{value="yarn"}
6464

6565
```
66-
yarn add --dev @nomicfoundation/hardhat-toolbox @nomicfoundation/hardhat-network-helpers @nomicfoundation/hardhat-chai-matchers@1 @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan chai ethers@5 hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v6
66+
yarn add --dev @nomicfoundation/hardhat-toolbox @nomicfoundation/hardhat-network-helpers @nomicfoundation/hardhat-chai-matchers@1 @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan chai@4 ethers@5 hardhat-gas-reporter solidity-coverage @typechain/hardhat typechain @typechain/ethers-v6
6767
```
6868

6969
:::

docs/src/content/hardhat-runner/docs/advanced/using-viem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Use the `hre.viem` object to get these helpers, similar to how clients are used.
105105
const initialSupply = await myToken.read.getCurrentSupply();
106106
console.log(`Initial supply of MyToken: ${initialSupply}`);
107107

108-
await myToken.write.increaseSupply([500_000n]);
108+
const hash = await myToken.write.increaseSupply([500_000n]);
109109
// increaseSupply sends a tx, so we need to wait for it to be mined
110110
const publicClient = await hre.viem.getPublicClient();
111111
await publicClient.waitForTransactionReceipt({ hash });

docs/src/content/ignition/docs/guides/creating-modules.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ m.call(myContract, "receivesEth" [], {
122122

123123
### Reading a value from a contract
124124

125-
If you need to call a `view` or `pure` function in a contract to retreive a value, you can do it with `m.staticCall`:
125+
If you need to call a `view` or `pure` function in a contract to retrieve a value, you can do it with `m.staticCall`:
126126

127127
```js
128128
const balance = m.staticCall(token, "balanceOf", [address]);
@@ -165,7 +165,7 @@ Calling `m.send` will create a `Future` representing the sending action. The fir
165165

166166
The second argument is the address of the account where you want to send the ETH or data to.
167167

168-
The third and forth parameters are both optional. They represent the amount of ETH and the data to be sent.
168+
The third and fourth parameters are both optional. They represent the amount of ETH and the data to be sent.
169169

170170
### Deploying a library
171171

@@ -179,7 +179,7 @@ If you need to link libraries take a look at the [Linking Libraries](#linking-li
179179

180180
## `Future` IDs
181181

182-
Each `Future` that is created should have a unique ID. In most cases, Hardhat Ignition will automatically generate an ID for the every `Future` you create, based on the creation parameters.
182+
Each `Future` that is created should have a unique ID. In most cases, Hardhat Ignition will automatically generate an ID for every `Future` you create, based on the creation parameters.
183183

184184
In some cases, this automatic process may lead to an ID clash with an existing `Future`. If that happens, Hardhat Ignition won't try to resolve the clash, and you will need to define an ID manually to resolve the issue. Every method of `ModuleBuilder` accepts an options object as last argument, which has an `id` field that can be used like this:
185185

e2e/clean.sh

100755100644
File mode changed.

e2e/fixture-projects/clean/test.sh

100755100644
File mode changed.

e2e/fixture-projects/compile-fail/test.sh

100755100644
File mode changed.

e2e/fixture-projects/compile/test.sh

100755100644
File mode changed.

e2e/fixture-projects/flatten/test.sh

100755100644
File mode changed.

0 commit comments

Comments
 (0)