hardhat 3.9.1 → 3.10.0

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.
Files changed (72) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.js +1 -1
  3. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.d.ts.map +1 -1
  4. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js +2 -0
  5. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js.map +1 -1
  6. package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.d.ts +2 -2
  7. package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.d.ts.map +1 -1
  8. package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.js.map +1 -1
  9. package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.d.ts +17 -1
  10. package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.d.ts.map +1 -1
  11. package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.js +19 -2
  12. package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.js.map +1 -1
  13. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.d.ts.map +1 -1
  14. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js +5 -1
  15. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js.map +1 -1
  16. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/hardfork.d.ts +8 -0
  17. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/hardfork.d.ts.map +1 -1
  18. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/hardfork.js +30 -1
  19. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/hardfork.js.map +1 -1
  20. package/dist/src/internal/builtin-plugins/node/task-action.d.ts.map +1 -1
  21. package/dist/src/internal/builtin-plugins/node/task-action.js +2 -37
  22. package/dist/src/internal/builtin-plugins/node/task-action.js.map +1 -1
  23. package/dist/src/internal/builtin-plugins/node/utils/resolve-node-connection-params.d.ts +19 -0
  24. package/dist/src/internal/builtin-plugins/node/utils/resolve-node-connection-params.d.ts.map +1 -0
  25. package/dist/src/internal/builtin-plugins/node/utils/resolve-node-connection-params.js +47 -0
  26. package/dist/src/internal/builtin-plugins/node/utils/resolve-node-connection-params.js.map +1 -0
  27. package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.d.ts.map +1 -1
  28. package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js +34 -7
  29. package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js.map +1 -1
  30. package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts +1 -0
  31. package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts.map +1 -1
  32. package/dist/src/internal/builtin-plugins/solidity-test/config.js +31 -5
  33. package/dist/src/internal/builtin-plugins/solidity-test/config.js.map +1 -1
  34. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.d.ts +9 -3
  35. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.d.ts.map +1 -1
  36. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js +60 -27
  37. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js.map +1 -1
  38. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts +1 -1
  39. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts.map +1 -1
  40. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js +19 -10
  41. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js.map +1 -1
  42. package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map +1 -1
  43. package/dist/src/internal/builtin-plugins/solidity-test/helpers.js +4 -1
  44. package/dist/src/internal/builtin-plugins/solidity-test/helpers.js.map +1 -1
  45. package/dist/src/internal/builtin-plugins/solidity-test/inline-config/index.d.ts +1 -1
  46. package/dist/src/internal/builtin-plugins/solidity-test/inline-config/index.d.ts.map +1 -1
  47. package/dist/src/internal/builtin-plugins/solidity-test/inline-config/index.js +13 -5
  48. package/dist/src/internal/builtin-plugins/solidity-test/inline-config/index.js.map +1 -1
  49. package/dist/src/internal/builtin-plugins/solidity-test/task-action.js +2 -2
  50. package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
  51. package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts +6 -0
  52. package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts.map +1 -1
  53. package/package.json +4 -4
  54. package/src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.ts +1 -1
  55. package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts +3 -0
  56. package/src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.ts +1 -1
  57. package/src/internal/builtin-plugins/network-manager/edr/types/hardfork.ts +20 -3
  58. package/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts +5 -0
  59. package/src/internal/builtin-plugins/network-manager/edr/utils/hardfork.ts +53 -1
  60. package/src/internal/builtin-plugins/node/task-action.ts +2 -52
  61. package/src/internal/builtin-plugins/node/utils/resolve-node-connection-params.ts +79 -0
  62. package/src/internal/builtin-plugins/solidity/build-system/build-system.ts +51 -8
  63. package/src/internal/builtin-plugins/solidity-test/config.ts +52 -5
  64. package/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.ts +64 -25
  65. package/src/internal/builtin-plugins/solidity-test/eip712/index.ts +23 -13
  66. package/src/internal/builtin-plugins/solidity-test/helpers.ts +5 -1
  67. package/src/internal/builtin-plugins/solidity-test/inline-config/index.ts +20 -9
  68. package/src/internal/builtin-plugins/solidity-test/task-action.ts +2 -2
  69. package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +6 -0
  70. package/templates/hardhat-3/01-node-test-runner-viem/package.json +1 -1
  71. package/templates/hardhat-3/02-mocha-ethers/package.json +3 -3
  72. package/templates/hardhat-3/03-minimal/package.json +1 -1
@@ -1,4 +1,6 @@
1
- import { bytesIncludesUtf8String, bytesToUtf8String, } from "@nomicfoundation/hardhat-utils/bytes";
1
+ import { HardhatError } from "@nomicfoundation/hardhat-errors";
2
+ import { bytesIncludesUtf8String, parseJsonBytes, } from "@nomicfoundation/hardhat-utils/bytes";
3
+ import { ensureError } from "@nomicfoundation/hardhat-utils/error";
2
4
  import { isPathSelected } from "../../../utils/glob.js";
3
5
  import { toUserSourceName } from "../../solidity/source-names.js";
4
6
  import { buildUserDefinedValueTypeIndex, extractStructsFromAst, } from "./ast-walker.js";
@@ -17,20 +19,27 @@ import { canonicalizeStructs } from "./canonicalize.js";
17
19
  * When `include` is empty/unset the feature is off: collection short-circuits
18
20
  * and returns an empty list without parsing any build info.
19
21
  */
20
- export function collectEip712CanonicalTypes(buildInfosAndOutputs, inputToUserSource, config) {
22
+ export async function collectEip712CanonicalTypes(buildInfosAndOutputs, inputToUserSource, config) {
21
23
  const { include, exclude } = config;
22
24
  if (include.length === 0) {
23
25
  return [];
24
26
  }
25
27
  const collected = [];
26
- const selectedNames = new Set();
27
- for (const { buildInfo, output } of buildInfosAndOutputs) {
28
+ const selectedSources = new Set();
29
+ for (const { buildInfoId, buildInfo, output } of buildInfosAndOutputs) {
28
30
  // Byte-level fast path: a build info whose source bytes don't contain
29
31
  // `struct ` can't define any EIP-712 type, so skip JSON-parsing its output.
30
32
  if (!bytesIncludesUtf8String(buildInfo, "struct ")) {
31
33
  continue;
32
34
  }
33
- const parsedOutput = JSON.parse(bytesToUtf8String(output));
35
+ let parsedOutput;
36
+ try {
37
+ parsedOutput = await parseJsonBytes(output);
38
+ }
39
+ catch (error) {
40
+ ensureError(error);
41
+ throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY.BUILD_INFO_OUTPUT_PARSE_ERROR, { buildInfoId }, error);
42
+ }
34
43
  const sources = parsedOutput.output.sources;
35
44
  if (sources === undefined) {
36
45
  continue;
@@ -57,16 +66,16 @@ export function collectEip712CanonicalTypes(buildInfosAndOutputs, inputToUserSou
57
66
  const userSourceName = inputToUserSource.get(inputSourceName) ??
58
67
  toUserSourceName(inputSourceName);
59
68
  // Collect every source so non-selected files can serve as dep targets;
60
- // selection is enforced at emit time via `selectedNames`.
69
+ // `selectedSources` enforces selection at emit time. Tracked per source,
70
+ // not per struct name, so a non-selected source defining a same-named
71
+ // struct isn't treated as selected (see `canonicalizeStructs`).
61
72
  const structs = extractStructsFromAst(source.ast, userSourceName, userDefinedValueTypeI);
62
73
  collected.push(...structs);
63
74
  if (isPathSelected(userSourceName, include, exclude)) {
64
- for (const s of structs) {
65
- selectedNames.add(s.name);
66
- }
75
+ selectedSources.add(userSourceName);
67
76
  }
68
77
  }
69
78
  }
70
- return canonicalizeStructs(collected, selectedNames);
79
+ return canonicalizeStructs(collected, selectedSources);
71
80
  }
72
81
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,EACL,8BAA8B,EAC9B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAOxD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,2BAA2B,CACzC,oBAA0C,EAC1C,iBAA8C,EAC9C,MAAyB;IAEzB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,SAAS,GAAsB,EAAE,CAAC;IACxC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACzD,sEAAsE;QACtE,4EAA4E;QAC5E,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;YACnD,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAA4B,IAAI,CAAC,KAAK,CACtD,iBAAiB,CAAC,MAAM,CAAC,CAC1B,CAAC;QAEF,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC;QAC5C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,SAAS;QACX,CAAC;QAED,+CAA+C;QAC/C,EAAE;QACF,mEAAmE;QACnE,gEAAgE;QAChE,qEAAqE;QACrE,+DAA+D;QAC/D,uEAAuE;QACvE,uEAAuE;QACvE,8CAA8C;QAC9C,EAAE;QACF,qEAAqE;QACrE,kEAAkE;QAClE,sEAAsE;QACtE,qDAAqD;QACrD,MAAM,qBAAqB,GAAG,8BAA8B,CAC1D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CACzC,CAAC;QAEF,KAAK,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAChE,wEAAwE;YACxE,qEAAqE;YACrE,sCAAsC;YACtC,MAAM,cAAc,GAClB,iBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC;gBACtC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YAEpC,uEAAuE;YACvE,0DAA0D;YAC1D,MAAM,OAAO,GAAG,qBAAqB,CACnC,MAAM,CAAC,GAAG,EACV,cAAc,EACd,qBAAqB,CACtB,CAAC;YACF,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;YAE3B,IAAI,cAAc,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;gBACrD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;oBACxB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AACvD,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EACV,4BAA4B,EAE5B,QAAQ,EACR,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAsB9B,UAAU,wBAAwB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,IAAI,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,wBAAsB,gDAAgD,CAAC,EACrE,SAAS,EACT,WAAW,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,GACrB,EAAE,wBAAwB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CA6GlE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAgB/D;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,IAAI,CAkBN"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EACV,4BAA4B,EAE5B,QAAQ,EACR,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAuB9B,UAAU,wBAAwB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,IAAI,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,wBAAsB,gDAAgD,CAAC,EACrE,SAAS,EACT,WAAW,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,GACrB,EAAE,wBAAwB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAgHlE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAgB/D;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,IAAI,CAkBN"}
@@ -5,6 +5,7 @@ import { hexStringToBytes } from "@nomicfoundation/hardhat-utils/hex";
5
5
  import { DEFAULT_VERBOSITY, OPTIMISM_CHAIN_TYPE } from "../../constants.js";
6
6
  import { resolveHardfork } from "../network-manager/config-resolution.js";
7
7
  import { hardhatHardforkToEdrSpecId } from "../network-manager/edr/utils/convert-to-edr.js";
8
+ import { warnIfExperimentalHardfork } from "../network-manager/edr/utils/hardfork.js";
8
9
  import { verbosityToIncludeTraces } from "../network-manager/edr/utils/trace-formatters.js";
9
10
  import { formatArtifactId } from "./formatters.js";
10
11
  export async function solidityTestConfigToSolidityTestRunnerConfigArgs({ chainType, projectRoot, hardfork, config, verbosity, observability, testPattern, generateGasReport, testFunctionOverrides, eip712CanonicalTypes, }) {
@@ -38,7 +39,9 @@ export async function solidityTestConfigToSolidityTestRunnerConfigArgs({ chainTy
38
39
  const sender = hexToBytes(config.from);
39
40
  const txOrigin = hexToBytes(config.txOrigin);
40
41
  const blockCoinbase = hexToBytes(config.coinbase);
41
- const resolvedHardfork = hardhatHardforkToEdrSpecId(resolveHardfork(hardfork, chainType), chainType);
42
+ const resolvedHardforkName = resolveHardfork(hardfork, chainType);
43
+ warnIfExperimentalHardfork(resolvedHardforkName, chainType);
44
+ const resolvedHardfork = hardhatHardforkToEdrSpecId(resolvedHardforkName, chainType);
42
45
  const localPredeploys = chainType === OPTIMISM_CHAIN_TYPE
43
46
  ? opGenesisState(opHardforkFromString(resolvedHardfork))
44
47
  : l1GenesisState(l1HardforkFromString(resolvedHardfork));
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"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"}
@@ -9,5 +9,5 @@ export { validateInlineOverrides } from "./validation.js";
9
9
  * in the solc AST. It only extracts them from the build info where each
10
10
  * test artifact's file was compiled as a root file.
11
11
  */
12
- export declare function getTestFunctionOverrides(testSuiteArtifacts: EdrArtifactWithMetadata[], buildInfosAndOutputs: BuildInfoAndOutput[]): TestFunctionOverride[];
12
+ export declare function getTestFunctionOverrides(testSuiteArtifacts: EdrArtifactWithMetadata[], buildInfosAndOutputs: BuildInfoAndOutput[]): Promise<TestFunctionOverride[]>;
13
13
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/inline-config/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAc,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAmB7E,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,mBAAmB,EACnB,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,0BAA0B,EAC1B,cAAc,EACd,qBAAqB,GACtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAQ1D;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,kBAAkB,EAAE,uBAAuB,EAAE,EAC7C,oBAAoB,EAAE,kBAAkB,EAAE,GACzC,oBAAoB,EAAE,CASxB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/inline-config/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAc,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAoB7E,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,mBAAmB,EACnB,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,0BAA0B,EAC1B,cAAc,EACd,qBAAqB,GACtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAQ1D;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,kBAAkB,EAAE,uBAAuB,EAAE,EAC7C,oBAAoB,EAAE,kBAAkB,EAAE,GACzC,OAAO,CAAC,oBAAoB,EAAE,CAAC,CASjC"}
@@ -1,5 +1,6 @@
1
1
  import { HardhatError, assertHardhatInvariant, } from "@nomicfoundation/hardhat-errors";
2
- import { bytesToUtf8String } from "@nomicfoundation/hardhat-utils/bytes";
2
+ import { parseJsonBytes } from "@nomicfoundation/hardhat-utils/bytes";
3
+ import { ensureError } from "@nomicfoundation/hardhat-utils/error";
3
4
  import { getFullyQualifiedName } from "../../../../utils/contract-names.js";
4
5
  import { buildInfoContainsInlineConfig, resolveFunctionSelector, buildConfigOverride, getFunctionFqn, } from "./helpers.js";
5
6
  import { extractInlineConfigFromAst } from "./parsing.js";
@@ -12,12 +13,12 @@ export { validateInlineOverrides } from "./validation.js";
12
13
  * in the solc AST. It only extracts them from the build info where each
13
14
  * test artifact's file was compiled as a root file.
14
15
  */
15
- export function getTestFunctionOverrides(testSuiteArtifacts, buildInfosAndOutputs) {
16
- const allRawOverrides = collectRawOverrides(testSuiteArtifacts, buildInfosAndOutputs);
16
+ export async function getTestFunctionOverrides(testSuiteArtifacts, buildInfosAndOutputs) {
17
+ const allRawOverrides = await collectRawOverrides(testSuiteArtifacts, buildInfosAndOutputs);
17
18
  validateInlineOverrides(allRawOverrides.overrides);
18
19
  return buildTestFunctionOverrides(allRawOverrides);
19
20
  }
20
- function collectRawOverrides(testSuiteArtifacts, buildInfosAndOutputs) {
21
+ async function collectRawOverrides(testSuiteArtifacts, buildInfosAndOutputs) {
21
22
  const overrides = [];
22
23
  const methodIdentifiersByContract = new Map();
23
24
  // Note: We group the artifacts by their build info, so that we only process
@@ -65,7 +66,14 @@ function collectRawOverrides(testSuiteArtifacts, buildInfosAndOutputs) {
65
66
  if (!buildInfoContainsInlineConfig(buildInfoAndOutput.buildInfo)) {
66
67
  continue;
67
68
  }
68
- const buildInfoOutput = JSON.parse(bytesToUtf8String(buildInfoAndOutput.output));
69
+ let buildInfoOutput;
70
+ try {
71
+ buildInfoOutput = await parseJsonBytes(buildInfoAndOutput.output);
72
+ }
73
+ catch (error) {
74
+ ensureError(error);
75
+ throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY.BUILD_INFO_OUTPUT_PARSE_ERROR, { buildInfoId }, error);
76
+ }
69
77
  for (const [inputSourceName, sourceArtifacts,] of artifactsBySource.entries()) {
70
78
  const contractNames = new Set(sourceArtifacts.map((a) => a.edrArtifact.id.name));
71
79
  const source = buildInfoOutput.output.sources[inputSourceName];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/inline-config/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/inline-config/index.ts"],"names":[],"mappings":"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"}
@@ -138,8 +138,8 @@ const runSolidityTests = async ({ testFiles, chainType, grep, noCompile, testSum
138
138
  hardfork = networkConfig.hardfork;
139
139
  }
140
140
  }
141
- const testFunctionOverrides = getTestFunctionOverrides(testSuiteArtifacts, allBuildInfosAndOutputs);
142
- const eip712CanonicalTypes = collectEip712CanonicalTypes(allBuildInfosAndOutputs, sourceNameToUserSourceName, eip712Types);
141
+ const testFunctionOverrides = await getTestFunctionOverrides(testSuiteArtifacts, allBuildInfosAndOutputs);
142
+ const eip712CanonicalTypes = await collectEip712CanonicalTypes(allBuildInfosAndOutputs, sourceNameToUserSourceName, eip712Types);
143
143
  const testRunnerConfig = await solidityTestConfigToSolidityTestRunnerConfigArgs({
144
144
  chainType,
145
145
  projectRoot: hre.config.paths.root,
@@ -1 +1 @@
1
- {"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/task-action.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/task-action.ts"],"names":[],"mappings":"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"}
@@ -26,6 +26,7 @@ declare module "../../../types/test.js" {
26
26
  includeStorage?: boolean;
27
27
  includePushBytes?: boolean;
28
28
  shrinkRunLimit?: number;
29
+ timeout?: number | bigint;
29
30
  }
30
31
  interface SolidityTestFuzzUserConfig {
31
32
  failurePersistDir?: string;
@@ -37,6 +38,7 @@ declare module "../../../types/test.js" {
37
38
  includeStorage?: boolean;
38
39
  includePushBytes?: boolean;
39
40
  showLogs?: boolean;
41
+ timeout?: number | bigint;
40
42
  }
41
43
  interface SolidityTestForkingUserConfig {
42
44
  url?: SensitiveString;
@@ -56,6 +58,7 @@ declare module "../../../types/test.js" {
56
58
  blockTimestamp?: bigint;
57
59
  prevRandao?: bigint;
58
60
  gasLimit?: bigint;
61
+ memoryLimit?: number | bigint;
59
62
  blockGasLimit?: number | bigint | false;
60
63
  transactionGasCap?: number | bigint | false;
61
64
  fuzz?: SolidityTestFuzzUserConfig;
@@ -91,6 +94,7 @@ declare module "../../../types/test.js" {
91
94
  includeStorage?: boolean;
92
95
  includePushBytes?: boolean;
93
96
  shrinkRunLimit?: number;
97
+ timeout?: number;
94
98
  }
95
99
  interface SolidityTestFuzzConfig {
96
100
  failurePersistDir?: string;
@@ -102,6 +106,7 @@ declare module "../../../types/test.js" {
102
106
  includeStorage?: boolean;
103
107
  includePushBytes?: boolean;
104
108
  showLogs?: boolean;
109
+ timeout?: number;
105
110
  }
106
111
  interface SolidityTestForkingConfig {
107
112
  url?: ResolvedConfigurationVariable;
@@ -122,6 +127,7 @@ declare module "../../../types/test.js" {
122
127
  blockTimestamp?: bigint;
123
128
  prevRandao?: bigint;
124
129
  gasLimit?: bigint;
130
+ memoryLimit?: bigint;
125
131
  blockGasLimit?: number | bigint | false;
126
132
  transactionGasCap?: number | bigint | false;
127
133
  fuzz: SolidityTestFuzzConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/type-extensions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/type-extensions.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hardhat",
3
- "version": "3.9.1",
3
+ "version": "3.10.0",
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://hardhat.org",
6
6
  "repository": {
@@ -77,9 +77,9 @@
77
77
  "@nomicfoundation/hardhat-test-utils": "^2.0.3"
78
78
  },
79
79
  "dependencies": {
80
- "@nomicfoundation/edr": "0.12.1",
81
- "@nomicfoundation/hardhat-errors": "^3.0.16",
82
- "@nomicfoundation/hardhat-utils": "^4.1.4",
80
+ "@nomicfoundation/edr": "0.14.0",
81
+ "@nomicfoundation/hardhat-errors": "^3.0.17",
82
+ "@nomicfoundation/hardhat-utils": "^4.1.5",
83
83
  "@nomicfoundation/hardhat-vendored": "^3.0.4",
84
84
  "@nomicfoundation/hardhat-zod-utils": "^3.0.5",
85
85
  "@nomicfoundation/solidity-analyzer": "^0.1.1",
@@ -10,7 +10,7 @@ let mnemonicToSeedSync: typeof Bip39T.mnemonicToSeedSync | undefined;
10
10
  // ethereum-cryptography/hdkey is known to be slow to load, so we lazy load it
11
11
  let HDKey: typeof HDKeyT | undefined;
12
12
 
13
- const HD_PATH_REGEX = /^m(:?\/\d+'?)+\/?$/;
13
+ const HD_PATH_REGEX = /^m(?:\/\d+'?)+\/?$/;
14
14
 
15
15
  export async function derivePrivateKeys(
16
16
  mnemonic: string,
@@ -59,6 +59,7 @@ import {
59
59
  hardhatForkingConfigToEdrForkConfig,
60
60
  resolveDefaultTransactionGasLimit,
61
61
  } from "./utils/convert-to-edr.js";
62
+ import { warnIfExperimentalHardfork } from "./utils/hardfork.js";
62
63
  import { printLine, replaceLastLine } from "./utils/logger.js";
63
64
 
64
65
  const log = createDebug("hardhat:core:network-manager:edr:provider");
@@ -109,6 +110,8 @@ export class EdrProvider extends BaseProvider {
109
110
  const printLineFn = loggerConfig.printLineFn ?? printLine;
110
111
  const replaceLastLineFn = loggerConfig.replaceLastLineFn ?? replaceLastLine;
111
112
 
113
+ warnIfExperimentalHardfork(networkConfig.hardfork, networkConfig.chainType);
114
+
112
115
  const providerConfig = await getProviderConfig(
113
116
  networkConfig,
114
117
  coverageConfig,
@@ -42,7 +42,6 @@ import {
42
42
  } from "@nomicfoundation/edr";
43
43
 
44
44
  export {
45
- SourceReference,
46
45
  StackTraceEntryType,
47
46
  CheatcodeErrorCode,
48
47
  stackTraceEntryTypeToString,
@@ -56,6 +55,7 @@ export {
56
55
  };
57
56
 
58
57
  export type {
58
+ SourceReference,
59
59
  CallstackEntryStackTraceEntry,
60
60
  UnrecognizedCreateCallstackEntryStackTraceEntry,
61
61
  UnrecognizedContractCallstackEntryStackTraceEntry,
@@ -22,6 +22,7 @@ export enum L1HardforkName {
22
22
  CANCUN = "cancun",
23
23
  PRAGUE = "prague",
24
24
  OSAKA = "osaka",
25
+ AMSTERDAM = "amsterdam",
25
26
  }
26
27
 
27
28
  export enum OpHardforkName {
@@ -44,10 +45,26 @@ export function getHardforks(chainType: ChainType): string[] {
44
45
  : L1_HARDFORK_ORDER;
45
46
  }
46
47
 
48
+ /**
49
+ * The latest *stable* hardforks. These are hardcoded (rather than derived from
50
+ * EDR's `l1HardforkLatest()`/`opLatestHardfork()`) so this module stays free of
51
+ * the native `@nomicfoundation/edr` addon on the config-resolution bootstrap
52
+ * path — see commit 2568ed1ba.
53
+ *
54
+ * They are NOT necessarily the last entry of the enum: the enum can contain
55
+ * experimental forks (e.g. Amsterdam) that EDR ships but hasn't promoted to
56
+ * latest yet. The invariant test in
57
+ * `test/.../edr/types/hardfork.ts` asserts these equal EDR's
58
+ * `l1HardforkLatest()`/`opLatestHardfork()` — bump them together when EDR
59
+ * promotes a fork.
60
+ */
61
+ export const L1_LATEST_STABLE_HARDFORK: L1HardforkName = L1HardforkName.OSAKA;
62
+ export const OP_LATEST_STABLE_HARDFORK: OpHardforkName = OpHardforkName.ISTHMUS;
63
+
47
64
  export function getCurrentHardfork(chainType: ChainType): string {
48
- const order =
49
- chainType === OPTIMISM_CHAIN_TYPE ? OP_HARDFORK_ORDER : L1_HARDFORK_ORDER;
50
- return order[order.length - 1];
65
+ return chainType === OPTIMISM_CHAIN_TYPE
66
+ ? OP_LATEST_STABLE_HARDFORK
67
+ : L1_LATEST_STABLE_HARDFORK;
51
68
  }
52
69
 
53
70
  /**
@@ -40,6 +40,7 @@ import {
40
40
  CANCUN,
41
41
  PRAGUE,
42
42
  OSAKA,
43
+ AMSTERDAM,
43
44
  BEDROCK,
44
45
  REGOLITH,
45
46
  CANYON,
@@ -114,6 +115,8 @@ export function edrL1HardforkToHardhatL1HardforkName(
114
115
  return L1HardforkName.PRAGUE;
115
116
  case SpecId.Osaka:
116
117
  return L1HardforkName.OSAKA;
118
+ case SpecId.Amsterdam:
119
+ return L1HardforkName.AMSTERDAM;
117
120
  // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- trust but verify
118
121
  default:
119
122
  const _exhaustiveCheck: never = hardfork;
@@ -235,6 +238,8 @@ function hardhatL1HardforkToEdrSpecId(hardfork: string): string {
235
238
  return PRAGUE;
236
239
  case L1HardforkName.OSAKA:
237
240
  return OSAKA;
241
+ case L1HardforkName.AMSTERDAM:
242
+ return AMSTERDAM;
238
243
 
239
244
  // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- we want to print the fork
240
245
  default:
@@ -1,6 +1,15 @@
1
+ import type { ChainType } from "../../../../../types/network.js";
2
+
3
+ import { styleText } from "node:util";
4
+
1
5
  import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
2
6
 
3
- import { L1HardforkName, OpHardforkName } from "../types/hardfork.js";
7
+ import {
8
+ getCurrentHardfork,
9
+ hardforkGte,
10
+ L1HardforkName,
11
+ OpHardforkName,
12
+ } from "../types/hardfork.js";
4
13
 
5
14
  export function getL1HardforkName(name: string): L1HardforkName {
6
15
  const hardforkName =
@@ -16,6 +25,49 @@ export function getL1HardforkName(name: string): L1HardforkName {
16
25
  return hardforkName;
17
26
  }
18
27
 
28
+ // Tracks which (chainType, hardfork) pairs have already been warned about, so
29
+ // we only print the experimental-hardfork warning once per process.
30
+ const warnedHardforks = new Set<string>();
31
+
32
+ /**
33
+ * Prints a warning if `hardfork` is strictly beyond the latest stable hardfork
34
+ * for the given chain type (i.e. an experimental fork that EDR supports but
35
+ * hasn't promoted to latest yet). The warning is emitted at
36
+ * most once per (chainType, hardfork) pair for the lifetime of the process.
37
+ */
38
+ export function warnIfExperimentalHardfork(
39
+ hardfork: string,
40
+ chainType: ChainType,
41
+ warn: (message: string) => void = (message) => console.error(message),
42
+ ): void {
43
+ const latestStable = getCurrentHardfork(chainType);
44
+
45
+ // Only warn for hardforks strictly beyond the latest stable one.
46
+ if (
47
+ hardfork === latestStable ||
48
+ !hardforkGte(hardfork, latestStable, chainType)
49
+ ) {
50
+ return;
51
+ }
52
+
53
+ const key = `${chainType}:${hardfork}`;
54
+
55
+ if (warnedHardforks.has(key)) {
56
+ return;
57
+ }
58
+
59
+ warnedHardforks.add(key);
60
+
61
+ warn(
62
+ styleText(["bold", "yellow"], "Warning:") +
63
+ ` you have configured the "${hardfork}" hardfork, which is experimental ` +
64
+ `and not yet finalized, so its behavior may change or be incomplete. ` +
65
+ `The latest stable hardfork is "${latestStable}". ` +
66
+ `Keep Hardhat up to date to track changes to "${hardfork}" and to pick up ` +
67
+ `its stable version once it activates on mainnet.\n`,
68
+ );
69
+ }
70
+
19
71
  export function getOpHardforkName(name: string): OpHardforkName {
20
72
  const hardforkName =
21
73
  Object.values(OpHardforkName)[
@@ -1,5 +1,3 @@
1
- import type { EdrNetworkConfigOverride } from "../../../types/config.js";
2
- import type { ChainType } from "../../../types/network.js";
3
1
  import type { NewTaskActionFunction } from "../../../types/tasks.js";
4
2
 
5
3
  import path from "node:path";
@@ -12,7 +10,6 @@ import {
12
10
  import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
13
11
  import { ensureDir, exists } from "@nomicfoundation/hardhat-utils/fs";
14
12
 
15
- import { isSupportedChainType } from "../../edr/chain-type.js";
16
13
  import { BUILD_INFO_DIR_NAME } from "../artifacts/artifact-manager.js";
17
14
  import { EdrProvider } from "../network-manager/edr/edr-provider.js";
18
15
 
@@ -22,6 +19,7 @@ import {
22
19
  formatEdrNetworkConfigAccounts,
23
20
  } from "./helpers.js";
24
21
  import { JsonRpcServerImplementation } from "./json-rpc/server.js";
22
+ import { resolveNodeConnectionParams } from "./utils/resolve-node-connection-params.js";
25
23
 
26
24
  const log = createDebug("hardhat:core:tasks:node");
27
25
 
@@ -56,55 +54,7 @@ const nodeAction: NewTaskActionFunction<NodeActionArguments> = async (
56
54
  });
57
55
  }
58
56
 
59
- const connectionParams: {
60
- network: string;
61
- chainType?: ChainType;
62
- override?: EdrNetworkConfigOverride;
63
- } = {
64
- network,
65
- };
66
-
67
- // NOTE: We create an empty network config override here. We add to it based
68
- // on the result of arguments parsing. We can expand the list of arguments
69
- // as much as needed.
70
- const networkConfigOverride: EdrNetworkConfigOverride = {};
71
-
72
- if (args.chainType !== undefined) {
73
- if (!isSupportedChainType(args.chainType)) {
74
- throw new HardhatError(
75
- HardhatError.ERRORS.CORE.ARGUMENTS.INVALID_VALUE_FOR_TYPE,
76
- {
77
- value: args.chainType,
78
- type: "ChainType",
79
- name: "chainType",
80
- },
81
- );
82
- }
83
- connectionParams.chainType = args.chainType;
84
- }
85
-
86
- if (args.chainId !== -1) {
87
- networkConfigOverride.chainId = args.chainId;
88
- }
89
-
90
- // NOTE: --fork-block-number is only valid if --fork is specified
91
- if (args.fork !== undefined) {
92
- networkConfigOverride.forking = {
93
- enabled: true,
94
- url: args.fork,
95
- ...(args.forkBlockNumber !== -1
96
- ? { blockNumber: args.forkBlockNumber }
97
- : undefined),
98
- };
99
- } else if (args.forkBlockNumber !== -1) {
100
- // NOTE: We could make the error more specific here.
101
- throw new HardhatError(
102
- HardhatError.ERRORS.CORE.ARGUMENTS.MISSING_VALUE_FOR_ARGUMENT,
103
- {
104
- argument: "fork",
105
- },
106
- );
107
- }
57
+ const connectionParams = resolveNodeConnectionParams(network, args);
108
58
 
109
59
  // NOTE: This is where we initialize the network; the create method returns
110
60
  // a fully resolved networkConfig object which might be useful for display