hardhat 3.1.2 → 3.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/src/internal/builtin-plugins/network-manager/config-resolution.js +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js +26 -25
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.js +3 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.js.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.js +53 -53
- package/dist/src/internal/builtin-plugins/test/task-action.js.map +1 -1
- package/package.json +2 -2
- package/src/internal/builtin-plugins/network-manager/config-resolution.ts +1 -1
- package/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts +40 -26
- package/src/internal/builtin-plugins/solidity/build-system/solc-info.ts +3 -0
- package/src/internal/builtin-plugins/test/task-action.ts +63 -66
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +1 -1
- package/templates/hardhat-3/02-mocha-ethers/package.json +4 -4
- package/templates/hardhat-3/03-minimal/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# hardhat
|
|
2
2
|
|
|
3
|
+
## 3.1.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 12d7468: Add mocha results to test summary numbers ([#7791](https://github.com/NomicFoundation/hardhat/pull/7791))
|
|
8
|
+
- 25155b5: Add support for the official builds of `solc` for ARM64 Linux ([#7752](https://github.com/NomicFoundation/hardhat/issues/7752))
|
|
9
|
+
- 065df38: Bumped EDR version to [`0.12.0-next.22`](https://github.com/NomicFoundation/edr/releases/tag/%40nomicfoundation%2Fedr%400.12.0-next.22).
|
|
10
|
+
- NomicFoundation/edr@b5a7b75: Added an API that reports the latest supported Solidity version for source instrumentation
|
|
11
|
+
- 5abcee6: Use Osaka as the default EVM target for solc 0.8.31+ and increase the gas limit per EIP-7935. Thanks @Amxx! ([#7813](https://github.com/NomicFoundation/hardhat/pull/7813))
|
|
12
|
+
|
|
3
13
|
## 3.1.2
|
|
4
14
|
|
|
5
15
|
### Patch Changes
|
|
@@ -35,7 +35,7 @@ export function resolveEdrNetwork(networkConfig, defaultChainType, cachePath, re
|
|
|
35
35
|
gasPrice: resolveGasConfig(networkConfig.gasPrice),
|
|
36
36
|
allowBlocksWithSameTimestamp: networkConfig.allowBlocksWithSameTimestamp ?? false,
|
|
37
37
|
allowUnlimitedContractSize: networkConfig.allowUnlimitedContractSize ?? false,
|
|
38
|
-
blockGasLimit: BigInt(networkConfig.blockGasLimit ??
|
|
38
|
+
blockGasLimit: BigInt(networkConfig.blockGasLimit ?? 60000000n),
|
|
39
39
|
coinbase: resolveCoinbase(networkConfig.coinbase),
|
|
40
40
|
forking: resolveForkingConfig(networkConfig.forking, cachePath, resolveConfigurationVariable),
|
|
41
41
|
hardfork: resolveHardfork(networkConfig.hardfork, networkConfig.chainType ?? defaultChainType),
|
|
@@ -2,7 +2,7 @@ import type { Compiler } from "./compiler.js";
|
|
|
2
2
|
import { download } from "@nomicfoundation/hardhat-utils/request";
|
|
3
3
|
export declare enum CompilerPlatform {
|
|
4
4
|
LINUX = "linux-amd64",
|
|
5
|
-
LINUX_ARM64 = "linux-
|
|
5
|
+
LINUX_ARM64 = "linux-arm64",
|
|
6
6
|
WINDOWS = "windows-amd64",
|
|
7
7
|
MACOS = "macosx-amd64",
|
|
8
8
|
WASM = "wasm"
|
package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloader.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAyB9C,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAelE,oBAAY,gBAAgB;IAC1B,KAAK,gBAAgB;IACrB,WAAW,
|
|
1
|
+
{"version":3,"file":"downloader.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAyB9C,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAelE,oBAAY,gBAAgB;IAC1B,KAAK,gBAAgB;IACrB,WAAW,gBAAgB;IAC3B,OAAO,kBAAkB;IACzB,KAAK,iBAAiB;IACtB,IAAI,SAAS;CACd;AAiBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,0BAA0B,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;;;OAIG;IACH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAExD;;;;;;OAMG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED;;GAEG;AACH,qBAAa,gCAAiC,YAAW,kBAAkB;;WAC3D,mBAAmB,IAAI,gBAAgB;IAoCrD;;OAEG;gBAED,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,EACpB,gBAAgB,GAAE,OAAO,QAAmB;IAOjC,0BAA0B,CACrC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GACpB,OAAO,CAAC,IAAI,CAAC;IAoBH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQvD,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2CnD,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;CA0OzE"}
|
|
@@ -20,7 +20,7 @@ const LINUX_ARM64_REPOSITORY_URL = "https://solc-linux-arm64-mirror.hardhat.org/
|
|
|
20
20
|
export var CompilerPlatform;
|
|
21
21
|
(function (CompilerPlatform) {
|
|
22
22
|
CompilerPlatform["LINUX"] = "linux-amd64";
|
|
23
|
-
CompilerPlatform["LINUX_ARM64"] = "linux-
|
|
23
|
+
CompilerPlatform["LINUX_ARM64"] = "linux-arm64";
|
|
24
24
|
CompilerPlatform["WINDOWS"] = "windows-amd64";
|
|
25
25
|
CompilerPlatform["MACOS"] = "macosx-amd64";
|
|
26
26
|
CompilerPlatform["WASM"] = "wasm";
|
|
@@ -178,40 +178,41 @@ export class CompilerDownloaderImplementation {
|
|
|
178
178
|
return true;
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
|
-
|
|
181
|
+
// download the list in case the cached list contains older ARM64 Linux builds without URL
|
|
182
|
+
return list.builds
|
|
183
|
+
.map((b) => b.path.startsWith("solc-v") && b.url === undefined)
|
|
184
|
+
.reduce((a, b) => a || b, false);
|
|
182
185
|
}
|
|
183
186
|
async #downloadCompilerList() {
|
|
184
187
|
log(`Downloading compiler list for platform ${this.#platform}`);
|
|
185
|
-
let url;
|
|
186
|
-
if (this.#onLinuxArm()) {
|
|
187
|
-
url = `${LINUX_ARM64_REPOSITORY_URL}/list.json`;
|
|
188
|
-
}
|
|
189
|
-
else {
|
|
190
|
-
url = `${COMPILER_REPOSITORY_URL}/${this.#platform}/list.json`;
|
|
191
|
-
}
|
|
192
188
|
const downloadPath = this.#getCompilerListPath();
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
189
|
+
// download hte official solc compiler list (now that ARM64 Linus is supported)
|
|
190
|
+
await this.#downloadFunction(`${COMPILER_REPOSITORY_URL}/${this.#platform}/list.json`, downloadPath);
|
|
191
|
+
// for Linux ARM64, we need to merge the official list with our custom builds
|
|
192
|
+
if (this.#platform === CompilerPlatform.LINUX_ARM64) {
|
|
193
|
+
// cache the official list since the file will be overwritten below
|
|
194
|
+
const officialCompilerList = await readJsonFile(downloadPath);
|
|
195
|
+
await this.#downloadFunction(`${LINUX_ARM64_REPOSITORY_URL}/list.json`, downloadPath);
|
|
196
|
+
// add missing information and an explicit URL for download
|
|
197
|
+
const armLinuxcompilerList = await readJsonFile(downloadPath);
|
|
198
|
+
for (const build of armLinuxcompilerList.builds) {
|
|
198
199
|
build.path = `solc-v${build.version}`;
|
|
200
|
+
build.url = LINUX_ARM64_REPOSITORY_URL;
|
|
199
201
|
build.longVersion = build.version;
|
|
200
202
|
}
|
|
201
|
-
|
|
203
|
+
// merge the official and custom lists
|
|
204
|
+
officialCompilerList.builds = officialCompilerList.builds.concat(armLinuxcompilerList.builds);
|
|
205
|
+
officialCompilerList.releases = {
|
|
206
|
+
...officialCompilerList.releases,
|
|
207
|
+
...armLinuxcompilerList.releases,
|
|
208
|
+
};
|
|
209
|
+
await writeJsonFile(downloadPath, officialCompilerList);
|
|
202
210
|
}
|
|
203
211
|
}
|
|
204
|
-
#onLinuxArm() {
|
|
205
|
-
return this.#platform === CompilerPlatform.LINUX_ARM64;
|
|
206
|
-
}
|
|
207
212
|
async #downloadCompiler(build) {
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
url = `${COMPILER_REPOSITORY_URL}/${this.#platform}/${build.path}`;
|
|
214
|
-
}
|
|
213
|
+
// use the explicit URL if available or the default solc download URL if not
|
|
214
|
+
const defaultUrl = `${COMPILER_REPOSITORY_URL}/${this.#platform}`;
|
|
215
|
+
const url = `${build.url ?? defaultUrl}/${build.path}`;
|
|
215
216
|
log(`Downloading compiler ${build.version} from ${url}`);
|
|
216
217
|
const downloadPath = this.#getCompilerDownloadPathFromBuild(build);
|
|
217
218
|
await this.#downloadFunction(url, downloadPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,YAAY,EACZ,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,KAAK,EACL,UAAU,EACV,SAAS,EACT,MAAM,EACN,cAAc,EACd,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,GAAG,GAAG,KAAK,CAAC,6BAA6B,CAAC,CAAC;AAEjD,MAAM,uBAAuB,GAAG,mCAAmC,CAAC;AAEpE,yEAAyE;AACzE,kCAAkC;AAClC,MAAM,0BAA0B,GAC9B,2DAA2D,CAAC;AAE9D,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,yCAAqB,CAAA;IACrB,
|
|
1
|
+
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/solc-info.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/solc-info.ts"],"names":[],"mappings":"AA0EA,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAEpB"}
|
|
@@ -67,6 +67,9 @@ const defaultEvmTargets = {
|
|
|
67
67
|
"0.8.28": "cancun",
|
|
68
68
|
"0.8.29": "cancun",
|
|
69
69
|
"0.8.30": "prague",
|
|
70
|
+
"0.8.31": "osaka",
|
|
71
|
+
"0.8.32": "osaka",
|
|
72
|
+
"0.8.33": "osaka",
|
|
70
73
|
};
|
|
71
74
|
export function getEvmVersionFromSolcVersion(solcVersion) {
|
|
72
75
|
return defaultEvmTargets[solcVersion];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solc-info.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/solc-info.ts"],"names":[],"mappings":"AAAA,MAAM,iBAAiB,GAA8B;IACnD,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"solc-info.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/solc-info.ts"],"names":[],"mappings":"AAAA,MAAM,iBAAiB,GAA8B;IACnD,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;CAClB,CAAC;AAEF,MAAM,UAAU,4BAA4B,CAC1C,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,yBAAyB,CAAC;AAUjC,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,WAAW,EAAE,qBAAqB,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,yBAAyB,CAAC;AAUjC,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,WAAW,EAAE,qBAAqB,CAAC,mBAAmB,CA8J3D,CAAC;AAyEF,eAAe,WAAW,CAAC"}
|
|
@@ -20,9 +20,7 @@ const runAllTests = async ({ testFiles, chainType, grep, noCompile, verbosity },
|
|
|
20
20
|
}
|
|
21
21
|
const testSummaries = {};
|
|
22
22
|
let failureIndex = 1;
|
|
23
|
-
const
|
|
24
|
-
const hasMocha = subtasks.some((subtask) => subtask.id[subtask.id.length - 1] === "mocha");
|
|
25
|
-
for (const subtask of subtasks) {
|
|
23
|
+
for (const subtask of thisTask.subtasks.values()) {
|
|
26
24
|
const files = getTestFilesForSubtask(subtask, testFiles, subtasksToFiles);
|
|
27
25
|
if (files === undefined) {
|
|
28
26
|
// This scenario occurs when `testFiles` are provided,
|
|
@@ -40,70 +38,72 @@ const runAllTests = async ({ testFiles, chainType, grep, noCompile, verbosity },
|
|
|
40
38
|
if (subtask.options.has("verbosity")) {
|
|
41
39
|
args.verbosity = verbosity;
|
|
42
40
|
}
|
|
43
|
-
|
|
41
|
+
const summaryId = subtask.id[subtask.id.length - 1];
|
|
42
|
+
if (subtask.options.has("testSummaryIndex")) {
|
|
44
43
|
args.testSummaryIndex = failureIndex;
|
|
45
|
-
const summaryId = subtask.id[subtask.id.length - 1];
|
|
46
44
|
testSummaries[summaryId] = await subtask.run(args);
|
|
47
45
|
failureIndex += testSummaries[summaryId].failed ?? 0;
|
|
48
46
|
}
|
|
47
|
+
else if (summaryId === "mocha") {
|
|
48
|
+
// mocha doesn't use the testSummaryIndex, but it does return failure & success counts
|
|
49
|
+
testSummaries[summaryId] = await subtask.run(args);
|
|
50
|
+
}
|
|
49
51
|
else {
|
|
50
52
|
await subtask.run(args);
|
|
51
53
|
}
|
|
52
54
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
passed.push([subtaskName, results.passed]);
|
|
62
|
-
}
|
|
63
|
-
if (results.failed > 0) {
|
|
64
|
-
failed.push([subtaskName, results.failed]);
|
|
65
|
-
}
|
|
66
|
-
if (results.skipped > 0) {
|
|
67
|
-
skipped.push([subtaskName, results.skipped]);
|
|
68
|
-
}
|
|
69
|
-
if (results.todo > 0) {
|
|
70
|
-
todo.push([subtaskName, results.todo]);
|
|
71
|
-
}
|
|
72
|
-
if (results.failureOutput !== "") {
|
|
73
|
-
const output = results.failureOutput;
|
|
74
|
-
if (subtaskName.includes("node")) {
|
|
75
|
-
outputLines.push(`\n${output}\n`);
|
|
76
|
-
}
|
|
77
|
-
else {
|
|
78
|
-
outputLines.push(output);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
55
|
+
const passed = [];
|
|
56
|
+
const failed = [];
|
|
57
|
+
const skipped = [];
|
|
58
|
+
const todo = [];
|
|
59
|
+
const outputLines = [];
|
|
60
|
+
for (const [subtaskName, results] of Object.entries(testSummaries)) {
|
|
61
|
+
if (results.passed !== undefined && results.passed > 0) {
|
|
62
|
+
passed.push([subtaskName, results.passed]);
|
|
81
63
|
}
|
|
82
|
-
if (
|
|
83
|
-
|
|
64
|
+
if (results.failed !== undefined && results.failed > 0) {
|
|
65
|
+
failed.push([subtaskName, results.failed]);
|
|
84
66
|
}
|
|
85
|
-
if (
|
|
86
|
-
|
|
67
|
+
if (results.skipped !== undefined && results.skipped > 0) {
|
|
68
|
+
skipped.push([subtaskName, results.skipped]);
|
|
87
69
|
}
|
|
88
|
-
if (
|
|
89
|
-
|
|
70
|
+
if (results.todo !== undefined && results.todo > 0) {
|
|
71
|
+
todo.push([subtaskName, results.todo]);
|
|
90
72
|
}
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
return o.replace(new RegExp(`${nl[0]}$`), "\n");
|
|
100
|
-
}
|
|
101
|
-
return o;
|
|
102
|
-
})
|
|
103
|
-
.join("\n"));
|
|
73
|
+
if (results.failureOutput !== undefined && results.failureOutput !== "") {
|
|
74
|
+
const output = results.failureOutput;
|
|
75
|
+
if (subtaskName.includes("node")) {
|
|
76
|
+
outputLines.push(`\n${output}\n`);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
outputLines.push(output);
|
|
80
|
+
}
|
|
104
81
|
}
|
|
105
|
-
console.log();
|
|
106
82
|
}
|
|
83
|
+
if (passed.length > 0) {
|
|
84
|
+
logSummaryLine("passing", passed, chalk.green);
|
|
85
|
+
}
|
|
86
|
+
if (failed.length > 0) {
|
|
87
|
+
logSummaryLine("failing", failed, chalk.red);
|
|
88
|
+
}
|
|
89
|
+
if (skipped.length > 0) {
|
|
90
|
+
logSummaryLine("skipped", skipped, chalk.cyan);
|
|
91
|
+
}
|
|
92
|
+
if (todo.length > 0) {
|
|
93
|
+
logSummaryLine("todo", todo, chalk.blue);
|
|
94
|
+
}
|
|
95
|
+
if (outputLines.length > 0) {
|
|
96
|
+
console.log(outputLines
|
|
97
|
+
.map((o) => {
|
|
98
|
+
const nl = o.match(/\n+$/gm);
|
|
99
|
+
if (nl !== null) {
|
|
100
|
+
return o.replace(new RegExp(`${nl[0]}$`), "\n");
|
|
101
|
+
}
|
|
102
|
+
return o;
|
|
103
|
+
})
|
|
104
|
+
.join("\n"));
|
|
105
|
+
}
|
|
106
|
+
console.log();
|
|
107
107
|
if (hre.globalOptions.coverage === true) {
|
|
108
108
|
assertHardhatInvariant(hre instanceof HardhatRuntimeEnvironmentImplementation, "Expected HRE to be an instance of HardhatRuntimeEnvironmentImplementation");
|
|
109
109
|
const ids = Array.from(thisTask.subtasks.keys());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAA6B,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,uCAAuC,EAAE,MAAM,mBAAmB,CAAC;AAU5E,MAAM,WAAW,GAA+C,KAAK,EACnE,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EACpD,GAAG,EACH,EAAE;IACF,+EAA+E;IAC/E,iGAAiG;IACjG,0IAA0I;IAC1I,MAAM,eAAe,GACnB,SAAS,CAAC,MAAM,KAAK,CAAC;QACpB,CAAC,CAAC,MAAM,2BAA2B,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;YACnC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QACxC,sBAAsB,CACpB,GAAG,YAAY,uCAAuC,EACtD,2EAA2E,CAC5E,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,aAAa,GASf,EAAE,CAAC;IAEP,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hardhat",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.3",
|
|
4
4
|
"description": "Hardhat is an extensible developer tool that helps smart contract developers increase productivity by reliably bringing together the tools they want.",
|
|
5
5
|
"homepage": "https://github.com/nomicfoundation/hardhat/tree/v-next/v-next/hardhat",
|
|
6
6
|
"repository": {
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@nomicfoundation/hardhat-test-utils": "^2.0.1"
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@nomicfoundation/edr": "0.12.0-next.
|
|
74
|
+
"@nomicfoundation/edr": "0.12.0-next.22",
|
|
75
75
|
"@nomicfoundation/hardhat-errors": "^3.0.6",
|
|
76
76
|
"@nomicfoundation/hardhat-utils": "^3.0.5",
|
|
77
77
|
"@nomicfoundation/hardhat-zod-utils": "^3.0.1",
|
|
@@ -85,7 +85,7 @@ export function resolveEdrNetwork(
|
|
|
85
85
|
networkConfig.allowBlocksWithSameTimestamp ?? false,
|
|
86
86
|
allowUnlimitedContractSize:
|
|
87
87
|
networkConfig.allowUnlimitedContractSize ?? false,
|
|
88
|
-
blockGasLimit: BigInt(networkConfig.blockGasLimit ??
|
|
88
|
+
blockGasLimit: BigInt(networkConfig.blockGasLimit ?? 60_000_000n),
|
|
89
89
|
coinbase: resolveCoinbase(networkConfig.coinbase),
|
|
90
90
|
|
|
91
91
|
forking: resolveForkingConfig(
|
|
@@ -40,7 +40,7 @@ const LINUX_ARM64_REPOSITORY_URL =
|
|
|
40
40
|
|
|
41
41
|
export enum CompilerPlatform {
|
|
42
42
|
LINUX = "linux-amd64",
|
|
43
|
-
LINUX_ARM64 = "linux-
|
|
43
|
+
LINUX_ARM64 = "linux-arm64",
|
|
44
44
|
WINDOWS = "windows-amd64",
|
|
45
45
|
MACOS = "macosx-amd64",
|
|
46
46
|
WASM = "wasm",
|
|
@@ -48,6 +48,7 @@ export enum CompilerPlatform {
|
|
|
48
48
|
|
|
49
49
|
interface CompilerBuild {
|
|
50
50
|
path: string;
|
|
51
|
+
url?: string;
|
|
51
52
|
version: string;
|
|
52
53
|
longVersion: string;
|
|
53
54
|
sha256: string;
|
|
@@ -341,46 +342,59 @@ export class CompilerDownloaderImplementation implements CompilerDownloader {
|
|
|
341
342
|
}
|
|
342
343
|
}
|
|
343
344
|
|
|
344
|
-
|
|
345
|
+
// download the list in case the cached list contains older ARM64 Linux builds without URL
|
|
346
|
+
return list.builds
|
|
347
|
+
.map((b) => b.path.startsWith("solc-v") && b.url === undefined)
|
|
348
|
+
.reduce((a, b) => a || b, false);
|
|
345
349
|
}
|
|
346
350
|
|
|
347
351
|
async #downloadCompilerList(): Promise<void> {
|
|
348
352
|
log(`Downloading compiler list for platform ${this.#platform}`);
|
|
349
|
-
let url: string;
|
|
350
|
-
|
|
351
|
-
if (this.#onLinuxArm()) {
|
|
352
|
-
url = `${LINUX_ARM64_REPOSITORY_URL}/list.json`;
|
|
353
|
-
} else {
|
|
354
|
-
url = `${COMPILER_REPOSITORY_URL}/${this.#platform}/list.json`;
|
|
355
|
-
}
|
|
356
353
|
const downloadPath = this.#getCompilerListPath();
|
|
357
354
|
|
|
358
|
-
|
|
355
|
+
// download hte official solc compiler list (now that ARM64 Linus is supported)
|
|
356
|
+
await this.#downloadFunction(
|
|
357
|
+
`${COMPILER_REPOSITORY_URL}/${this.#platform}/list.json`,
|
|
358
|
+
downloadPath,
|
|
359
|
+
);
|
|
360
|
+
|
|
361
|
+
// for Linux ARM64, we need to merge the official list with our custom builds
|
|
362
|
+
if (this.#platform === CompilerPlatform.LINUX_ARM64) {
|
|
363
|
+
// cache the official list since the file will be overwritten below
|
|
364
|
+
const officialCompilerList: CompilerList =
|
|
365
|
+
await readJsonFile(downloadPath);
|
|
366
|
+
|
|
367
|
+
await this.#downloadFunction(
|
|
368
|
+
`${LINUX_ARM64_REPOSITORY_URL}/list.json`,
|
|
369
|
+
downloadPath,
|
|
370
|
+
);
|
|
359
371
|
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
for (const build of
|
|
372
|
+
// add missing information and an explicit URL for download
|
|
373
|
+
const armLinuxcompilerList: CompilerList =
|
|
374
|
+
await readJsonFile(downloadPath);
|
|
375
|
+
for (const build of armLinuxcompilerList.builds) {
|
|
364
376
|
build.path = `solc-v${build.version}`;
|
|
377
|
+
build.url = LINUX_ARM64_REPOSITORY_URL;
|
|
365
378
|
build.longVersion = build.version;
|
|
366
379
|
}
|
|
367
380
|
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
381
|
+
// merge the official and custom lists
|
|
382
|
+
officialCompilerList.builds = officialCompilerList.builds.concat(
|
|
383
|
+
armLinuxcompilerList.builds,
|
|
384
|
+
);
|
|
385
|
+
officialCompilerList.releases = {
|
|
386
|
+
...officialCompilerList.releases,
|
|
387
|
+
...armLinuxcompilerList.releases,
|
|
388
|
+
};
|
|
371
389
|
|
|
372
|
-
|
|
373
|
-
|
|
390
|
+
await writeJsonFile(downloadPath, officialCompilerList);
|
|
391
|
+
}
|
|
374
392
|
}
|
|
375
393
|
|
|
376
394
|
async #downloadCompiler(build: CompilerBuild): Promise<string> {
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
url = `${LINUX_ARM64_REPOSITORY_URL}/${build.path}`;
|
|
381
|
-
} else {
|
|
382
|
-
url = `${COMPILER_REPOSITORY_URL}/${this.#platform}/${build.path}`;
|
|
383
|
-
}
|
|
395
|
+
// use the explicit URL if available or the default solc download URL if not
|
|
396
|
+
const defaultUrl = `${COMPILER_REPOSITORY_URL}/${this.#platform}`;
|
|
397
|
+
const url = `${build.url ?? defaultUrl}/${build.path}`;
|
|
384
398
|
|
|
385
399
|
log(`Downloading compiler ${build.version} from ${url}`);
|
|
386
400
|
|
|
@@ -52,20 +52,16 @@ const runAllTests: NewTaskActionFunction<TestActionArguments> = async (
|
|
|
52
52
|
const testSummaries: Record<
|
|
53
53
|
string,
|
|
54
54
|
{
|
|
55
|
-
failed
|
|
56
|
-
passed
|
|
57
|
-
skipped
|
|
58
|
-
todo
|
|
59
|
-
failureOutput
|
|
55
|
+
failed?: number;
|
|
56
|
+
passed?: number;
|
|
57
|
+
skipped?: number;
|
|
58
|
+
todo?: number;
|
|
59
|
+
failureOutput?: string;
|
|
60
60
|
}
|
|
61
61
|
> = {};
|
|
62
62
|
|
|
63
63
|
let failureIndex = 1;
|
|
64
|
-
const
|
|
65
|
-
const hasMocha = subtasks.some(
|
|
66
|
-
(subtask) => subtask.id[subtask.id.length - 1] === "mocha",
|
|
67
|
-
);
|
|
68
|
-
for (const subtask of subtasks) {
|
|
64
|
+
for (const subtask of thisTask.subtasks.values()) {
|
|
69
65
|
const files = getTestFilesForSubtask(subtask, testFiles, subtasksToFiles);
|
|
70
66
|
|
|
71
67
|
if (files === undefined) {
|
|
@@ -88,86 +84,87 @@ const runAllTests: NewTaskActionFunction<TestActionArguments> = async (
|
|
|
88
84
|
args.verbosity = verbosity;
|
|
89
85
|
}
|
|
90
86
|
|
|
91
|
-
|
|
92
|
-
args.testSummaryIndex = failureIndex;
|
|
87
|
+
const summaryId = subtask.id[subtask.id.length - 1];
|
|
93
88
|
|
|
94
|
-
|
|
89
|
+
if (subtask.options.has("testSummaryIndex")) {
|
|
90
|
+
args.testSummaryIndex = failureIndex;
|
|
95
91
|
|
|
96
92
|
testSummaries[summaryId] = await subtask.run(args);
|
|
97
93
|
failureIndex += testSummaries[summaryId].failed ?? 0;
|
|
94
|
+
} else if (summaryId === "mocha") {
|
|
95
|
+
// mocha doesn't use the testSummaryIndex, but it does return failure & success counts
|
|
96
|
+
testSummaries[summaryId] = await subtask.run(args);
|
|
98
97
|
} else {
|
|
99
98
|
await subtask.run(args);
|
|
100
99
|
}
|
|
101
100
|
}
|
|
102
101
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
const outputLines: string[] = [];
|
|
102
|
+
const passed: Array<[string, number]> = [];
|
|
103
|
+
const failed: Array<[string, number]> = [];
|
|
104
|
+
const skipped: Array<[string, number]> = [];
|
|
105
|
+
const todo: Array<[string, number]> = [];
|
|
106
|
+
const outputLines: string[] = [];
|
|
109
107
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
108
|
+
for (const [subtaskName, results] of Object.entries(testSummaries)) {
|
|
109
|
+
if (results.passed !== undefined && results.passed > 0) {
|
|
110
|
+
passed.push([subtaskName, results.passed]);
|
|
111
|
+
}
|
|
114
112
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
113
|
+
if (results.failed !== undefined && results.failed > 0) {
|
|
114
|
+
failed.push([subtaskName, results.failed]);
|
|
115
|
+
}
|
|
118
116
|
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
117
|
+
if (results.skipped !== undefined && results.skipped > 0) {
|
|
118
|
+
skipped.push([subtaskName, results.skipped]);
|
|
119
|
+
}
|
|
122
120
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
121
|
+
if (results.todo !== undefined && results.todo > 0) {
|
|
122
|
+
todo.push([subtaskName, results.todo]);
|
|
123
|
+
}
|
|
126
124
|
|
|
127
|
-
|
|
128
|
-
|
|
125
|
+
if (results.failureOutput !== undefined && results.failureOutput !== "") {
|
|
126
|
+
const output = results.failureOutput;
|
|
129
127
|
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}
|
|
128
|
+
if (subtaskName.includes("node")) {
|
|
129
|
+
outputLines.push(`\n${output}\n`);
|
|
130
|
+
} else {
|
|
131
|
+
outputLines.push(output);
|
|
135
132
|
}
|
|
136
133
|
}
|
|
134
|
+
}
|
|
137
135
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if (failed.length > 0) {
|
|
143
|
-
logSummaryLine("failing", failed, chalk.red);
|
|
144
|
-
}
|
|
136
|
+
if (passed.length > 0) {
|
|
137
|
+
logSummaryLine("passing", passed, chalk.green);
|
|
138
|
+
}
|
|
145
139
|
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
140
|
+
if (failed.length > 0) {
|
|
141
|
+
logSummaryLine("failing", failed, chalk.red);
|
|
142
|
+
}
|
|
149
143
|
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
144
|
+
if (skipped.length > 0) {
|
|
145
|
+
logSummaryLine("skipped", skipped, chalk.cyan);
|
|
146
|
+
}
|
|
153
147
|
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
.map((o) => {
|
|
158
|
-
const nl = o.match(/\n+$/gm);
|
|
159
|
-
if (nl !== null) {
|
|
160
|
-
return o.replace(new RegExp(`${nl[0]}$`), "\n");
|
|
161
|
-
}
|
|
162
|
-
return o;
|
|
163
|
-
})
|
|
164
|
-
.join("\n"),
|
|
165
|
-
);
|
|
166
|
-
}
|
|
148
|
+
if (todo.length > 0) {
|
|
149
|
+
logSummaryLine("todo", todo, chalk.blue);
|
|
150
|
+
}
|
|
167
151
|
|
|
168
|
-
|
|
152
|
+
if (outputLines.length > 0) {
|
|
153
|
+
console.log(
|
|
154
|
+
outputLines
|
|
155
|
+
.map((o) => {
|
|
156
|
+
const nl = o.match(/\n+$/gm);
|
|
157
|
+
if (nl !== null) {
|
|
158
|
+
return o.replace(new RegExp(`${nl[0]}$`), "\n");
|
|
159
|
+
}
|
|
160
|
+
return o;
|
|
161
|
+
})
|
|
162
|
+
.join("\n"),
|
|
163
|
+
);
|
|
169
164
|
}
|
|
170
165
|
|
|
166
|
+
console.log();
|
|
167
|
+
|
|
171
168
|
if (hre.globalOptions.coverage === true) {
|
|
172
169
|
assertHardhatInvariant(
|
|
173
170
|
hre instanceof HardhatRuntimeEnvironmentImplementation,
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"description": "A TypeScript Hardhat project using Node Test Runner and Viem",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"devDependencies": {
|
|
8
|
-
"hardhat": "workspace:^3.1.
|
|
8
|
+
"hardhat": "workspace:^3.1.3",
|
|
9
9
|
"@nomicfoundation/hardhat-toolbox-viem": "workspace:^5.0.1",
|
|
10
10
|
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.6",
|
|
11
11
|
"@types/node": "^22.8.5",
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
"description": "A TypeScript Hardhat project using Mocha and Ethers.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"devDependencies": {
|
|
8
|
-
"hardhat": "workspace:^3.1.
|
|
8
|
+
"hardhat": "workspace:^3.1.3",
|
|
9
9
|
"@nomicfoundation/hardhat-toolbox-mocha-ethers": "workspace:^3.0.2",
|
|
10
|
-
"@nomicfoundation/hardhat-ethers": "workspace:^4.0.
|
|
10
|
+
"@nomicfoundation/hardhat-ethers": "workspace:^4.0.4",
|
|
11
11
|
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.6",
|
|
12
12
|
"@types/chai": "^4.2.0",
|
|
13
13
|
"@types/chai-as-promised": "^8.0.1",
|
|
@@ -20,12 +20,12 @@
|
|
|
20
20
|
"typescript": "~5.8.0"
|
|
21
21
|
},
|
|
22
22
|
"peerDependencies": {
|
|
23
|
-
"@nomicfoundation/hardhat-ethers": "workspace:^4.0.
|
|
23
|
+
"@nomicfoundation/hardhat-ethers": "workspace:^4.0.4",
|
|
24
24
|
"@nomicfoundation/hardhat-ethers-chai-matchers": "workspace:^3.0.2",
|
|
25
25
|
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.6",
|
|
26
26
|
"@nomicfoundation/hardhat-ignition-ethers": "workspace:^3.0.6",
|
|
27
27
|
"@nomicfoundation/hardhat-keystore": "workspace:^3.0.2",
|
|
28
|
-
"@nomicfoundation/hardhat-mocha": "workspace:^3.0.
|
|
28
|
+
"@nomicfoundation/hardhat-mocha": "workspace:^3.0.9",
|
|
29
29
|
"@nomicfoundation/hardhat-network-helpers": "workspace:^3.0.3",
|
|
30
30
|
"@nomicfoundation/hardhat-typechain": "workspace:^3.0.0",
|
|
31
31
|
"@nomicfoundation/hardhat-verify": "workspace:^3.0.8",
|