hardhat 3.4.2 → 3.4.4
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 +37 -0
- package/dist/src/internal/builtin-plugins/console/task-action.js +4 -4
- package/dist/src/internal/builtin-plugins/console/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/coverage-manager.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/coverage/coverage-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/coverage-manager.js +16 -16
- package/dist/src/internal/builtin-plugins/coverage/coverage-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers/accessors.js +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers/accessors.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.js +2 -2
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/instrumentation.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/instrumentation.js +7 -2
- package/dist/src/internal/builtin-plugins/coverage/instrumentation.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/process-coverage.js +6 -6
- package/dist/src/internal/builtin-plugins/coverage/process-coverage.js.map +1 -1
- package/dist/src/internal/builtin-plugins/flatten/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/flatten/task-action.js +4 -4
- package/dist/src/internal/builtin-plugins/flatten/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.js +10 -10
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.js +12 -9
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers/accessors.js +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers/accessors.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers/utils.js +2 -2
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers/utils.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js +9 -9
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js +5 -5
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js +2 -2
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.d.ts +2 -2
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.js +21 -24
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-output.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-output.js +13 -11
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/trace-output.js.map +1 -1
- package/dist/src/internal/builtin-plugins/node/artifacts/build-info-watcher.js +2 -2
- package/dist/src/internal/builtin-plugins/node/artifacts/build-info-watcher.js.map +1 -1
- package/dist/src/internal/builtin-plugins/node/helpers.d.ts +2 -1
- package/dist/src/internal/builtin-plugins/node/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/node/helpers.js +3 -3
- package/dist/src/internal/builtin-plugins/node/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/node/json-rpc/server.js +2 -2
- package/dist/src/internal/builtin-plugins/node/json-rpc/server.js.map +1 -1
- package/dist/src/internal/builtin-plugins/node/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/node/task-action.js +4 -4
- package/dist/src/internal/builtin-plugins/node/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js +18 -9
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job-cost.d.ts +8 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job-cost.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job-cost.js +46 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job-cost.js.map +1 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.js +9 -3
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.js.map +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 +2 -2
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/index.js +2 -2
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/solcjs-wrapper.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/solcjs-wrapper.js +7 -19
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/solcjs-wrapper.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.js +4 -3
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/utils.d.ts +2 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/utils.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/utils.js +12 -8
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/utils.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.d.ts +3 -2
- 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 +15 -6
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/config.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/config.js +2 -2
- package/dist/src/internal/builtin-plugins/solidity/config.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/constants.d.ts +1 -0
- package/dist/src/internal/builtin-plugins/solidity/constants.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/constants.js +2 -0
- package/dist/src/internal/builtin-plugins/solidity/constants.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/config.js +1 -0
- package/dist/src/internal/builtin-plugins/solidity-test/config.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts +1 -2
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.js +3 -3
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.d.ts +2 -2
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.js +19 -17
- package/dist/src/internal/builtin-plugins/solidity-test/reporter.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js +5 -2
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts +1 -0
- package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts.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 +8 -6
- package/dist/src/internal/builtin-plugins/test/task-action.js.map +1 -1
- package/dist/src/internal/cli/banner-manager.js +2 -2
- package/dist/src/internal/cli/banner-manager.js.map +1 -1
- package/dist/src/internal/cli/error-handler.d.ts.map +1 -1
- package/dist/src/internal/cli/error-handler.js +6 -6
- package/dist/src/internal/cli/error-handler.js.map +1 -1
- package/dist/src/internal/cli/help/get-help-string.js +2 -2
- package/dist/src/internal/cli/help/get-help-string.js.map +1 -1
- package/dist/src/internal/cli/init/init.d.ts.map +1 -1
- package/dist/src/internal/cli/init/init.js +40 -28
- package/dist/src/internal/cli/init/init.js.map +1 -1
- package/dist/src/internal/cli/init/package-manager.d.ts.map +1 -1
- package/dist/src/internal/cli/init/package-manager.js +5 -5
- package/dist/src/internal/cli/init/package-manager.js.map +1 -1
- package/dist/src/internal/cli/init/prompt.d.ts.map +1 -1
- package/dist/src/internal/cli/init/prompt.js +3 -3
- package/dist/src/internal/cli/init/prompt.js.map +1 -1
- package/dist/src/internal/cli/main.d.ts.map +1 -1
- package/dist/src/internal/cli/main.js +2 -2
- package/dist/src/internal/cli/main.js.map +1 -1
- package/dist/src/internal/cli/node-version.js +1 -1
- package/dist/src/internal/cli/telemetry/analytics/analytics.js +2 -2
- package/dist/src/internal/cli/telemetry/analytics/analytics.js.map +1 -1
- package/dist/src/internal/cli/telemetry/analytics/utils.js +2 -2
- package/dist/src/internal/cli/telemetry/analytics/utils.js.map +1 -1
- package/dist/src/internal/cli/telemetry/error-classification/classifier.d.ts +58 -0
- package/dist/src/internal/cli/telemetry/error-classification/classifier.d.ts.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/classifier.js +402 -0
- package/dist/src/internal/cli/telemetry/error-classification/classifier.js.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/codebase-dependent-helpers.d.ts +67 -0
- package/dist/src/internal/cli/telemetry/error-classification/codebase-dependent-helpers.d.ts.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/codebase-dependent-helpers.js +140 -0
- package/dist/src/internal/cli/telemetry/error-classification/codebase-dependent-helpers.js.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/filter.d.ts +15 -0
- package/dist/src/internal/cli/telemetry/error-classification/filter.d.ts.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/filter.js +114 -0
- package/dist/src/internal/cli/telemetry/error-classification/filter.js.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/helpers.d.ts +52 -0
- package/dist/src/internal/cli/telemetry/error-classification/helpers.d.ts.map +1 -0
- package/dist/src/internal/cli/telemetry/error-classification/helpers.js +163 -0
- package/dist/src/internal/cli/telemetry/error-classification/helpers.js.map +1 -0
- package/dist/src/internal/cli/telemetry/error-reporter/global-error-handlers.js +2 -2
- package/dist/src/internal/cli/telemetry/error-reporter/global-error-handlers.js.map +1 -1
- package/dist/src/internal/cli/telemetry/error-reporter/reporter.d.ts.map +1 -1
- package/dist/src/internal/cli/telemetry/error-reporter/reporter.js +14 -0
- package/dist/src/internal/cli/telemetry/error-reporter/reporter.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/anonymizer.d.ts +0 -2
- package/dist/src/internal/cli/telemetry/sentry/anonymizer.d.ts.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/anonymizer.js +0 -117
- package/dist/src/internal/cli/telemetry/sentry/anonymizer.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/init.d.ts.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/init.js +14 -9
- package/dist/src/internal/cli/telemetry/sentry/init.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/reporter.d.ts.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/reporter.js +3 -29
- package/dist/src/internal/cli/telemetry/sentry/reporter.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/subprocess.js +13 -19
- package/dist/src/internal/cli/telemetry/sentry/subprocess.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/transport.js +2 -2
- package/dist/src/internal/cli/telemetry/sentry/transport.js.map +1 -1
- package/dist/src/internal/cli/telemetry/telemetry-permissions.js +2 -2
- package/dist/src/internal/cli/telemetry/telemetry-permissions.js.map +1 -1
- package/dist/src/internal/config-loading.js +2 -2
- package/dist/src/internal/config-loading.js.map +1 -1
- package/dist/src/internal/core/hook-manager.d.ts.map +1 -1
- package/dist/src/internal/core/hook-manager.js +10 -3
- package/dist/src/internal/core/hook-manager.js.map +1 -1
- package/dist/src/internal/core/user-interruptions.js +4 -4
- package/dist/src/internal/core/user-interruptions.js.map +1 -1
- package/dist/src/internal/using-hardhat2-plugin-errors.d.ts.map +1 -1
- package/dist/src/internal/using-hardhat2-plugin-errors.js +2 -2
- package/dist/src/internal/using-hardhat2-plugin-errors.js.map +1 -1
- package/package.json +6 -9
- package/src/internal/builtin-plugins/console/task-action.ts +4 -4
- package/src/internal/builtin-plugins/coverage/coverage-manager.ts +21 -17
- package/src/internal/builtin-plugins/coverage/helpers/accessors.ts +1 -1
- package/src/internal/builtin-plugins/coverage/hook-handlers/solidity.ts +2 -2
- package/src/internal/builtin-plugins/coverage/instrumentation.ts +21 -2
- package/src/internal/builtin-plugins/coverage/process-coverage.ts +6 -6
- package/src/internal/builtin-plugins/flatten/task-action.ts +8 -4
- package/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.ts +11 -10
- package/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.ts +13 -9
- package/src/internal/builtin-plugins/gas-analytics/helpers/accessors.ts +1 -1
- package/src/internal/builtin-plugins/gas-analytics/helpers/utils.ts +2 -2
- package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts +10 -9
- package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts +11 -5
- package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts +2 -2
- package/src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.ts +23 -23
- package/src/internal/builtin-plugins/network-manager/edr/utils/trace-output.ts +14 -11
- package/src/internal/builtin-plugins/node/artifacts/build-info-watcher.ts +2 -2
- package/src/internal/builtin-plugins/node/helpers.ts +7 -4
- package/src/internal/builtin-plugins/node/json-rpc/server.ts +2 -2
- package/src/internal/builtin-plugins/node/task-action.ts +5 -4
- package/src/internal/builtin-plugins/solidity/build-system/build-system.ts +23 -9
- package/src/internal/builtin-plugins/solidity/build-system/compilation-job-cost.ts +61 -0
- package/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.ts +17 -3
- package/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts +4 -2
- package/src/internal/builtin-plugins/solidity/build-system/compiler/index.ts +2 -2
- package/src/internal/builtin-plugins/solidity/build-system/compiler/solcjs-wrapper.ts +19 -22
- package/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.ts +9 -1
- package/src/internal/builtin-plugins/solidity/build-system/resolver/utils.ts +16 -7
- package/src/internal/builtin-plugins/solidity/build-system/solc-info.ts +27 -6
- package/src/internal/builtin-plugins/solidity/config.ts +5 -2
- package/src/internal/builtin-plugins/solidity/constants.ts +3 -0
- package/src/internal/builtin-plugins/solidity-test/config.ts +1 -0
- package/src/internal/builtin-plugins/solidity-test/helpers.ts +3 -4
- package/src/internal/builtin-plugins/solidity-test/reporter.ts +19 -18
- package/src/internal/builtin-plugins/solidity-test/task-action.ts +5 -2
- package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +1 -0
- package/src/internal/builtin-plugins/test/task-action.ts +12 -6
- package/src/internal/cli/banner-manager.ts +2 -2
- package/src/internal/cli/error-handler.ts +10 -6
- package/src/internal/cli/help/get-help-string.ts +2 -2
- package/src/internal/cli/init/init.ts +53 -28
- package/src/internal/cli/init/package-manager.ts +8 -6
- package/src/internal/cli/init/prompt.ts +4 -3
- package/src/internal/cli/main.ts +4 -3
- package/src/internal/cli/node-version.ts +1 -1
- package/src/internal/cli/telemetry/analytics/analytics.ts +2 -2
- package/src/internal/cli/telemetry/analytics/utils.ts +2 -2
- package/src/internal/cli/telemetry/error-classification/classifier.ts +636 -0
- package/src/internal/cli/telemetry/error-classification/codebase-dependent-helpers.ts +200 -0
- package/src/internal/cli/telemetry/error-classification/filter.ts +140 -0
- package/src/internal/cli/telemetry/error-classification/helpers.ts +235 -0
- package/src/internal/cli/telemetry/error-reporter/global-error-handlers.ts +2 -2
- package/src/internal/cli/telemetry/error-reporter/reporter.ts +21 -0
- package/src/internal/cli/telemetry/sentry/anonymizer.ts +0 -168
- package/src/internal/cli/telemetry/sentry/init.ts +42 -33
- package/src/internal/cli/telemetry/sentry/reporter.ts +4 -47
- package/src/internal/cli/telemetry/sentry/subprocess.ts +13 -21
- package/src/internal/cli/telemetry/sentry/transport.ts +2 -2
- package/src/internal/cli/telemetry/telemetry-permissions.ts +2 -2
- package/src/internal/config-loading.ts +2 -2
- package/src/internal/core/hook-manager.ts +21 -3
- package/src/internal/core/user-interruptions.ts +4 -4
- package/src/internal/using-hardhat2-plugin-errors.ts +2 -2
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +7 -7
- package/templates/hardhat-3/02-mocha-ethers/package.json +12 -12
- package/templates/hardhat-3/03-minimal/package.json +1 -1
- package/dist/src/internal/utils/colorizer.d.ts +0 -10
- package/dist/src/internal/utils/colorizer.d.ts.map +0 -1
- package/dist/src/internal/utils/colorizer.js +0 -2
- package/dist/src/internal/utils/colorizer.js.map +0 -1
- package/src/internal/utils/colorizer.ts +0 -9
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type { Colorizer } from "../../../../utils/colorizer.js";
|
|
2
1
|
import type {
|
|
3
2
|
LogTrace,
|
|
4
3
|
CallTrace,
|
|
5
4
|
DecodedTraceParameters,
|
|
6
5
|
} from "@nomicfoundation/edr";
|
|
7
6
|
|
|
7
|
+
import { styleText } from "node:util";
|
|
8
|
+
|
|
8
9
|
import { LogKind, CallKind, IncludeTraces } from "@nomicfoundation/edr";
|
|
9
10
|
import { bytesToHexString } from "@nomicfoundation/hardhat-utils/hex";
|
|
10
11
|
|
|
@@ -23,9 +24,10 @@ export function verbosityToIncludeTraces(verbosity: number): IncludeTraces {
|
|
|
23
24
|
export function formatTraces(
|
|
24
25
|
traces: CallTrace[],
|
|
25
26
|
prefix: string,
|
|
26
|
-
|
|
27
|
+
// Allow passing a custom colorize function for testing purposes
|
|
28
|
+
colorize: typeof styleText = styleText,
|
|
27
29
|
): string {
|
|
28
|
-
const lines = traces.map((trace) => formatTrace(trace,
|
|
30
|
+
const lines = traces.map((trace) => formatTrace(trace, colorize));
|
|
29
31
|
const formattedTraces = formatNestedArray(lines, prefix);
|
|
30
32
|
// Remove the trailing newline
|
|
31
33
|
return formattedTraces.slice(0, -1);
|
|
@@ -52,9 +54,13 @@ function formatOutputs(outputs: string | Uint8Array): string | undefined {
|
|
|
52
54
|
}
|
|
53
55
|
}
|
|
54
56
|
|
|
55
|
-
function formatLog(
|
|
57
|
+
function formatLog(
|
|
58
|
+
log: LogTrace,
|
|
59
|
+
// Allow passing a custom colorize function for testing purposes
|
|
60
|
+
colorize: typeof styleText,
|
|
61
|
+
): string[] {
|
|
56
62
|
const { parameters } = log;
|
|
57
|
-
const tag =
|
|
63
|
+
const tag = colorize("yellow", "[event]");
|
|
58
64
|
const lines = [];
|
|
59
65
|
|
|
60
66
|
if (Array.isArray(parameters)) {
|
|
@@ -63,18 +69,18 @@ function formatLog(log: LogTrace, colorizer: Colorizer): string[] {
|
|
|
63
69
|
|
|
64
70
|
for (let i = 0; i < topicCount; i++) {
|
|
65
71
|
const prefix = i === 0 ? `${tag} topic 0` : ` topic ${i}`;
|
|
66
|
-
lines.push(`${prefix}: ${
|
|
72
|
+
lines.push(`${prefix}: ${colorize("cyan", hexValues[i])}`);
|
|
67
73
|
}
|
|
68
74
|
|
|
69
75
|
if (hexValues.length > 0) {
|
|
70
76
|
const dataPrefix = topicCount > 0 ? " data" : `${tag} data`;
|
|
71
77
|
lines.push(
|
|
72
|
-
`${dataPrefix}: ${
|
|
78
|
+
`${dataPrefix}: ${colorize("cyan", hexValues[hexValues.length - 1])}`,
|
|
73
79
|
);
|
|
74
80
|
}
|
|
75
81
|
} else {
|
|
76
82
|
lines.push(
|
|
77
|
-
`${tag} ${parameters.name}(${
|
|
83
|
+
`${tag} ${parameters.name}(${colorize("cyan", parameters.arguments.join(", "))})`,
|
|
78
84
|
);
|
|
79
85
|
}
|
|
80
86
|
return lines;
|
|
@@ -82,7 +88,7 @@ function formatLog(log: LogTrace, colorizer: Colorizer): string[] {
|
|
|
82
88
|
|
|
83
89
|
function formatTrace(
|
|
84
90
|
trace: CallTrace,
|
|
85
|
-
|
|
91
|
+
colorize: typeof styleText,
|
|
86
92
|
): NestedArray<string> {
|
|
87
93
|
const {
|
|
88
94
|
success,
|
|
@@ -95,14 +101,8 @@ function formatTrace(
|
|
|
95
101
|
isCheatcode,
|
|
96
102
|
outputs,
|
|
97
103
|
} = trace;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
color = colorizer.blue;
|
|
101
|
-
} else if (success) {
|
|
102
|
-
color = colorizer.green;
|
|
103
|
-
} else {
|
|
104
|
-
color = colorizer.red;
|
|
105
|
-
}
|
|
104
|
+
const colorName = isCheatcode ? "blue" : success ? "green" : "red";
|
|
105
|
+
const color = (text: string) => colorize(colorName, text);
|
|
106
106
|
|
|
107
107
|
const formattedInputs = formatInputs(inputs, color);
|
|
108
108
|
const formattedOutputs = formatOutputs(outputs);
|
|
@@ -110,7 +110,7 @@ function formatTrace(
|
|
|
110
110
|
let openingLine: string;
|
|
111
111
|
let closingLine: string | undefined;
|
|
112
112
|
if (kind === CallKind.Create) {
|
|
113
|
-
openingLine = `[${gasUsed}] ${
|
|
113
|
+
openingLine = `[${gasUsed}] ${colorize("yellow", "→ new")} ${contract ?? "<unknown>"}@${address}`;
|
|
114
114
|
// TODO: Uncomment this when the formattedInputs starts containing
|
|
115
115
|
// the address of where the contract was deployed instead of the code.
|
|
116
116
|
// if (formattedInputs !== undefined) {
|
|
@@ -125,11 +125,11 @@ function formatTrace(
|
|
|
125
125
|
openingLine = `${openingLine} {value: ${value}}`;
|
|
126
126
|
}
|
|
127
127
|
if (kind === CallKind.StaticCall) {
|
|
128
|
-
openingLine = `${openingLine} ${
|
|
128
|
+
openingLine = `${openingLine} ${colorize("yellow", "[staticcall]")}`;
|
|
129
129
|
} else if (kind === CallKind.DelegateCall) {
|
|
130
|
-
openingLine = `${openingLine} ${
|
|
130
|
+
openingLine = `${openingLine} ${colorize("yellow", "[delegatecall]")}`;
|
|
131
131
|
} else if (kind === CallKind.CallCode) {
|
|
132
|
-
openingLine = `${openingLine} ${
|
|
132
|
+
openingLine = `${openingLine} ${colorize("yellow", "[callcode]")}`;
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
if (formattedOutputs !== undefined) {
|
|
@@ -147,9 +147,9 @@ function formatTrace(
|
|
|
147
147
|
lines.push(openingLine);
|
|
148
148
|
for (const child of trace.children) {
|
|
149
149
|
if (child.kind === LogKind.Log) {
|
|
150
|
-
lines.push(formatLog(child,
|
|
150
|
+
lines.push(formatLog(child, colorize));
|
|
151
151
|
} else {
|
|
152
|
-
lines.push(formatTrace(child,
|
|
152
|
+
lines.push(formatTrace(child, colorize));
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
155
|
if (closingLine !== undefined) {
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import type { Response } from "@nomicfoundation/edr";
|
|
2
2
|
|
|
3
|
-
import
|
|
4
|
-
|
|
3
|
+
import { styleText } from "node:util";
|
|
4
|
+
|
|
5
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
5
6
|
|
|
6
7
|
import { formatTraces } from "./trace-formatters.js";
|
|
7
8
|
|
|
8
|
-
const log =
|
|
9
|
+
const log = createDebug("hardhat:core:network-manager:edr:trace-output");
|
|
9
10
|
|
|
10
11
|
// Rotating palette for per-connection coloring of trace headers.
|
|
11
12
|
const LABEL_COLORS: Array<(text: string) => string> = [
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
(text: string) => styleText("cyan", text),
|
|
14
|
+
(text: string) => styleText("magenta", text),
|
|
15
|
+
(text: string) => styleText("blueBright", text),
|
|
16
|
+
(text: string) => styleText("yellowBright", text),
|
|
17
|
+
(text: string) => styleText("cyanBright", text),
|
|
18
|
+
(text: string) => styleText("magentaBright", text),
|
|
18
19
|
];
|
|
19
20
|
|
|
20
21
|
// Keyed by `network name` (not connection label) so the map stays bounded
|
|
@@ -107,10 +108,12 @@ export class TraceOutputManager {
|
|
|
107
108
|
const coloredLabel = this.#labelColor(this.#connectionLabel);
|
|
108
109
|
const prefix = callTraces.length > 1 ? "Traces from" : "Trace from";
|
|
109
110
|
const coloredPrefix = this.#labelColor(prefix);
|
|
110
|
-
const styledMethod = failed
|
|
111
|
+
const styledMethod = failed
|
|
112
|
+
? styleText("red", method)
|
|
113
|
+
: styleText("dim", method);
|
|
111
114
|
const header = `${coloredPrefix} ${coloredLabel}: ${styledMethod}`;
|
|
112
115
|
|
|
113
|
-
this.#printLineFn(`${header}\n${formatTraces(callTraces, " "
|
|
116
|
+
this.#printLineFn(`${header}\n${formatTraces(callTraces, " ")}`);
|
|
114
117
|
} catch (e) {
|
|
115
118
|
log("Failed to get call traces: %O", e);
|
|
116
119
|
}
|
|
@@ -2,13 +2,13 @@ import type { FSWatcher } from "chokidar";
|
|
|
2
2
|
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
|
|
5
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
5
6
|
import { watch } from "chokidar";
|
|
6
|
-
import debug from "debug";
|
|
7
7
|
|
|
8
8
|
export type BuildInfoWatcher = FSWatcher;
|
|
9
9
|
export type BuildInfoHandler = (buildId: string) => Promise<void>;
|
|
10
10
|
|
|
11
|
-
const log =
|
|
11
|
+
const log = createDebug("hardhat:core:tasks:node:artifacts");
|
|
12
12
|
|
|
13
13
|
const STABILITY_THRESHOLD = 250;
|
|
14
14
|
const POLL_INTERVAL = 50;
|
|
@@ -2,16 +2,17 @@ import type { BuildInfo } from "../../../types/artifacts.js";
|
|
|
2
2
|
import type { EdrNetworkAccountsConfig } from "../../../types/config.js";
|
|
3
3
|
import type { SolidityBuildInfoOutput } from "../../../types/solidity.js";
|
|
4
4
|
import type { EdrProvider } from "../network-manager/edr/edr-provider.js";
|
|
5
|
+
import type { DebugLogger } from "@nomicfoundation/hardhat-utils/debug";
|
|
5
6
|
import type * as MicroEthSignerT from "micro-eth-signer";
|
|
6
7
|
|
|
7
8
|
import path from "node:path";
|
|
9
|
+
import { styleText } from "node:util";
|
|
8
10
|
|
|
9
11
|
import {
|
|
10
12
|
readJsonFile,
|
|
11
13
|
readJsonFileAsStream,
|
|
12
14
|
} from "@nomicfoundation/hardhat-utils/fs";
|
|
13
15
|
import { hexStringToBytes } from "@nomicfoundation/hardhat-utils/hex";
|
|
14
|
-
import chalk from "chalk";
|
|
15
16
|
|
|
16
17
|
// micro-eth-signer is known to be slow to load, so we lazy load it
|
|
17
18
|
let microEthSigner: typeof MicroEthSignerT | undefined;
|
|
@@ -94,7 +95,7 @@ export async function formatEdrNetworkConfigAccounts(
|
|
|
94
95
|
export function createBuildInfoUploadHandlerFrom(
|
|
95
96
|
buildInfoDirPath: string,
|
|
96
97
|
provider: EdrProvider,
|
|
97
|
-
log:
|
|
98
|
+
log: DebugLogger,
|
|
98
99
|
): (buildId: string) => Promise<void> {
|
|
99
100
|
const buildInfoHandler = async (buildId: string) => {
|
|
100
101
|
try {
|
|
@@ -116,7 +117,8 @@ export function createBuildInfoUploadHandlerFrom(
|
|
|
116
117
|
log(`Added compiler result for ${buildId}`);
|
|
117
118
|
} catch (error) {
|
|
118
119
|
console.warn(
|
|
119
|
-
|
|
120
|
+
styleText(
|
|
121
|
+
"yellow",
|
|
120
122
|
`There was a problem adding the new compiler result for build ${buildId}.`,
|
|
121
123
|
),
|
|
122
124
|
);
|
|
@@ -137,7 +139,8 @@ export function createBuildInfoUploadHandlerFrom(
|
|
|
137
139
|
|
|
138
140
|
// NOTE: This function is exported for testing purposes only
|
|
139
141
|
export function getPublicPrivateKeysWarning(): string {
|
|
140
|
-
return
|
|
142
|
+
return styleText(
|
|
143
|
+
"bold",
|
|
141
144
|
"WARNING: Funds sent on live network to accounts with publicly known private keys WILL BE LOST.",
|
|
142
145
|
);
|
|
143
146
|
}
|
|
@@ -5,12 +5,12 @@ import type { AddressInfo } from "node:net";
|
|
|
5
5
|
|
|
6
6
|
import http from "node:http";
|
|
7
7
|
|
|
8
|
-
import
|
|
8
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
9
9
|
import { WebSocketServer } from "ws";
|
|
10
10
|
|
|
11
11
|
import { JsonRpcHandler } from "./handler.js";
|
|
12
12
|
|
|
13
|
-
const log =
|
|
13
|
+
const log = createDebug("hardhat:core:tasks:node:json-rpc:server");
|
|
14
14
|
|
|
15
15
|
export interface JsonRpcServerConfig {
|
|
16
16
|
hostname: string;
|
|
@@ -3,14 +3,14 @@ import type { ChainType } from "../../../types/network.js";
|
|
|
3
3
|
import type { NewTaskActionFunction } from "../../../types/tasks.js";
|
|
4
4
|
|
|
5
5
|
import path from "node:path";
|
|
6
|
+
import { styleText } from "node:util";
|
|
6
7
|
|
|
7
8
|
import {
|
|
8
9
|
assertHardhatInvariant,
|
|
9
10
|
HardhatError,
|
|
10
11
|
} from "@nomicfoundation/hardhat-errors";
|
|
12
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
11
13
|
import { ensureDir, exists } from "@nomicfoundation/hardhat-utils/fs";
|
|
12
|
-
import chalk from "chalk";
|
|
13
|
-
import debug from "debug";
|
|
14
14
|
|
|
15
15
|
import { isSupportedChainType } from "../../edr/chain-type.js";
|
|
16
16
|
import { BUILD_INFO_DIR_NAME } from "../artifacts/artifact-manager.js";
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
} from "./helpers.js";
|
|
24
24
|
import { JsonRpcServerImplementation } from "./json-rpc/server.js";
|
|
25
25
|
|
|
26
|
-
const log =
|
|
26
|
+
const log = createDebug("hardhat:core:tasks:node");
|
|
27
27
|
|
|
28
28
|
interface NodeActionArguments {
|
|
29
29
|
hostname?: string;
|
|
@@ -143,7 +143,8 @@ const nodeAction: NewTaskActionFunction<NodeActionArguments> = async (
|
|
|
143
143
|
const { port: actualPort, address: actualHostname } = await server.listen();
|
|
144
144
|
|
|
145
145
|
console.log(
|
|
146
|
-
|
|
146
|
+
styleText(
|
|
147
|
+
"green",
|
|
147
148
|
`Started HTTP and WebSocket JSON-RPC server at http://${actualHostname}:${actualPort}/`,
|
|
148
149
|
),
|
|
149
150
|
);
|
|
@@ -33,11 +33,13 @@ import type {
|
|
|
33
33
|
|
|
34
34
|
import os from "node:os";
|
|
35
35
|
import path from "node:path";
|
|
36
|
+
import { styleText } from "node:util";
|
|
36
37
|
|
|
37
38
|
import {
|
|
38
39
|
assertHardhatInvariant,
|
|
39
40
|
HardhatError,
|
|
40
41
|
} from "@nomicfoundation/hardhat-errors";
|
|
42
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
41
43
|
import {
|
|
42
44
|
exists,
|
|
43
45
|
ensureDir,
|
|
@@ -54,8 +56,6 @@ import {
|
|
|
54
56
|
import { shortenPath } from "@nomicfoundation/hardhat-utils/path";
|
|
55
57
|
import { createSpinner } from "@nomicfoundation/hardhat-utils/spinner";
|
|
56
58
|
import { pluralize } from "@nomicfoundation/hardhat-utils/string";
|
|
57
|
-
import chalk from "chalk";
|
|
58
|
-
import debug from "debug";
|
|
59
59
|
import pMap from "p-map";
|
|
60
60
|
|
|
61
61
|
import { FileBuildResultType } from "../../../../types/solidity/build-system.js";
|
|
@@ -71,6 +71,7 @@ import {
|
|
|
71
71
|
getDuplicatedContractNamesDeclarationFile,
|
|
72
72
|
} from "./artifacts.js";
|
|
73
73
|
import { loadCache, saveCache } from "./cache.js";
|
|
74
|
+
import { sortCompilationJobsByDescendingCost } from "./compilation-job-cost.js";
|
|
74
75
|
import { CompilationJobImplementation } from "./compilation-job.js";
|
|
75
76
|
import { downloadSolcCompilers, getCompiler } from "./compiler/index.js";
|
|
76
77
|
import { buildDependencyGraph } from "./dependency-graph-building.js";
|
|
@@ -84,7 +85,7 @@ import {
|
|
|
84
85
|
import { SolcConfigSelector } from "./solc-config-selection.js";
|
|
85
86
|
import { shouldSuppressWarning } from "./warning-suppression.js";
|
|
86
87
|
|
|
87
|
-
const log =
|
|
88
|
+
const log = createDebug("hardhat:core:solidity:build-system");
|
|
88
89
|
|
|
89
90
|
/**
|
|
90
91
|
* Returns true if the given compiler config is a SolcSolidityCompilerConfig.
|
|
@@ -339,8 +340,18 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
339
340
|
),
|
|
340
341
|
);
|
|
341
342
|
|
|
342
|
-
|
|
343
|
+
// We sort the compilation jobs in descending order of estimated
|
|
344
|
+
// compilation cost. This way we can use this algorithm:
|
|
345
|
+
// https://en.wikipedia.org/wiki/Longest-processing-time-first_scheduling
|
|
346
|
+
//
|
|
347
|
+
// Note that it works because pMap schedules the jobs in the order they
|
|
348
|
+
// are in the array.
|
|
349
|
+
const sortedCompilationJobs = sortCompilationJobsByDescendingCost(
|
|
343
350
|
runnableCompilationJobs,
|
|
351
|
+
);
|
|
352
|
+
|
|
353
|
+
const results: CompilationResult[] = await pMap(
|
|
354
|
+
sortedCompilationJobs,
|
|
344
355
|
async (runnableCompilationJob) => {
|
|
345
356
|
const { output, compiler } = await this.runCompilationJob(
|
|
346
357
|
runnableCompilationJob,
|
|
@@ -1356,13 +1367,14 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1356
1367
|
error.message;
|
|
1357
1368
|
|
|
1358
1369
|
console.error(
|
|
1359
|
-
errorMessage
|
|
1360
|
-
"
|
|
1370
|
+
errorMessage
|
|
1371
|
+
.replace(/^\w+:/, (t) => styleText(["red", "bold"], t))
|
|
1372
|
+
.trimEnd() + "\n",
|
|
1361
1373
|
);
|
|
1362
1374
|
} else {
|
|
1363
1375
|
console.warn(
|
|
1364
1376
|
(error.formattedMessage ?? error.message)
|
|
1365
|
-
.replace(/^\w+:/, (t) =>
|
|
1377
|
+
.replace(/^\w+:/, (t) => styleText(["yellow", "bold"], t))
|
|
1366
1378
|
.trimEnd() + "\n",
|
|
1367
1379
|
);
|
|
1368
1380
|
}
|
|
@@ -1374,7 +1386,8 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1374
1386
|
|
|
1375
1387
|
if (hasConsoleErrors) {
|
|
1376
1388
|
console.error(
|
|
1377
|
-
|
|
1389
|
+
styleText(
|
|
1390
|
+
"red",
|
|
1378
1391
|
`The console.log call you made isn't supported. See https://hardhat.org/console-log for the list of supported methods.`,
|
|
1379
1392
|
),
|
|
1380
1393
|
);
|
|
@@ -1467,7 +1480,8 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1467
1480
|
}
|
|
1468
1481
|
|
|
1469
1482
|
console.log(
|
|
1470
|
-
|
|
1483
|
+
styleText(
|
|
1484
|
+
"bold",
|
|
1471
1485
|
`Compiled ${rootFiles} Solidity ${pluralize(
|
|
1472
1486
|
options.scope === "contracts" ? "file" : "test file",
|
|
1473
1487
|
rootFiles,
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import type { CompilationJob } from "../../../../types/solidity.js";
|
|
2
|
+
|
|
3
|
+
import { SOLC_DEFAULT_OPTIMIZER_RUNS } from "../constants.js";
|
|
4
|
+
|
|
5
|
+
// This doesn't need to be exact, it's used to account for the per-file
|
|
6
|
+
// overhead, so that many small files don't look free
|
|
7
|
+
const APPROXIMATE_AVERAGE_SIZE_OF_SOLIDITY_FILES = 10_000;
|
|
8
|
+
|
|
9
|
+
export function estimateCompilationJobCost(job: CompilationJob): number {
|
|
10
|
+
let totalChars = 0;
|
|
11
|
+
let fileCount = 0;
|
|
12
|
+
|
|
13
|
+
for (const file of job.dependencyGraph.getAllFiles()) {
|
|
14
|
+
totalChars += file.content.text.length;
|
|
15
|
+
fileCount += 1;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const settings = job.solcConfig.settings ?? {};
|
|
19
|
+
const viaIR = settings.viaIR === true;
|
|
20
|
+
const optimizerEnabled = settings.optimizer?.enabled === true;
|
|
21
|
+
const optimizerRuns: number =
|
|
22
|
+
settings.optimizer?.runs ?? SOLC_DEFAULT_OPTIMIZER_RUNS;
|
|
23
|
+
|
|
24
|
+
const viaIRMultiplier = viaIR === true ? 6.0 : 1.0;
|
|
25
|
+
const optimizerMultiplier = optimizerEnabled ? 1.4 : 1.0;
|
|
26
|
+
|
|
27
|
+
// The optimizer `runs` is not the number of times that the optimizer is run.
|
|
28
|
+
// It represents how many times the contract will be run.
|
|
29
|
+
// While it has an effect in the compilation time, it's not linear nor
|
|
30
|
+
// dominant.
|
|
31
|
+
//
|
|
32
|
+
// We use Math.log10 and Math.min to represent that:
|
|
33
|
+
// - increasing runs probably has diminishing impact in cost
|
|
34
|
+
// - going from 1 -> 200 matters more than 200 -> 20_000
|
|
35
|
+
// - runs should contribute weakly compared with viaIR
|
|
36
|
+
const runsMultiplier = optimizerEnabled
|
|
37
|
+
? 1 + Math.min(0.12, Math.log10(Math.max(1, optimizerRuns)) * 0.04)
|
|
38
|
+
: 1.0;
|
|
39
|
+
|
|
40
|
+
const fileOverhead = APPROXIMATE_AVERAGE_SIZE_OF_SOLIDITY_FILES * fileCount;
|
|
41
|
+
|
|
42
|
+
return (
|
|
43
|
+
(totalChars + fileOverhead) *
|
|
44
|
+
viaIRMultiplier *
|
|
45
|
+
optimizerMultiplier *
|
|
46
|
+
runsMultiplier
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Returns a new array containing the given compilation jobs sorted by their
|
|
52
|
+
* estimated cost in descending order. The input array is not mutated.
|
|
53
|
+
*/
|
|
54
|
+
export function sortCompilationJobsByDescendingCost(
|
|
55
|
+
compilationJobs: CompilationJob[],
|
|
56
|
+
): CompilationJob[] {
|
|
57
|
+
return compilationJobs
|
|
58
|
+
.map((job) => ({ job, cost: estimateCompilationJobCost(job) }))
|
|
59
|
+
.sort((a, b) => b.cost - a.cost)
|
|
60
|
+
.map(({ job }) => job);
|
|
61
|
+
}
|
|
@@ -3,6 +3,7 @@ import type {
|
|
|
3
3
|
CompilerOutput,
|
|
4
4
|
} from "../../../../../types/solidity/compiler-io.js";
|
|
5
5
|
import type { Compiler } from "../../../../../types/solidity/compiler.js";
|
|
6
|
+
import type { SemverVersion } from "@nomicfoundation/hardhat-utils/fast-semver";
|
|
6
7
|
|
|
7
8
|
import { spawn } from "node:child_process";
|
|
8
9
|
import fsPromises from "node:fs/promises";
|
|
@@ -16,13 +17,19 @@ import {
|
|
|
16
17
|
assertHardhatInvariant,
|
|
17
18
|
} from "@nomicfoundation/hardhat-errors";
|
|
18
19
|
import { ensureError } from "@nomicfoundation/hardhat-utils/error";
|
|
20
|
+
import {
|
|
21
|
+
greaterThanOrEqual,
|
|
22
|
+
parseVersion,
|
|
23
|
+
} from "@nomicfoundation/hardhat-utils/fast-semver";
|
|
19
24
|
import {
|
|
20
25
|
mkdtemp,
|
|
21
26
|
readJsonFileAsStream,
|
|
22
27
|
remove,
|
|
23
28
|
} from "@nomicfoundation/hardhat-utils/fs";
|
|
24
29
|
import { createNonClosingWriter } from "@nomicfoundation/hardhat-utils/stream";
|
|
25
|
-
|
|
30
|
+
|
|
31
|
+
const NO_IMPORT_CALLBACK_MIN_VERSION: SemverVersion = [0, 8, 22];
|
|
32
|
+
const BASE_PATH_MIN_VERSION: SemverVersion = [0, 6, 9];
|
|
26
33
|
|
|
27
34
|
/**
|
|
28
35
|
* Spawns a compilation process and returns its output.
|
|
@@ -163,10 +170,17 @@ export class NativeCompiler implements Compiler {
|
|
|
163
170
|
// Logic to make sure that solc default import callback is not being used.
|
|
164
171
|
// If solcVersion is not defined or <= 0.6.8, do not add extra args.
|
|
165
172
|
if (this.version !== undefined) {
|
|
166
|
-
|
|
173
|
+
const parsed = parseVersion(this.version);
|
|
174
|
+
if (parsed === undefined) {
|
|
175
|
+
throw new HardhatError(
|
|
176
|
+
HardhatError.ERRORS.CORE.SOLIDITY.INVALID_SOLC_VERSION,
|
|
177
|
+
{ version: this.version },
|
|
178
|
+
);
|
|
179
|
+
}
|
|
180
|
+
if (greaterThanOrEqual(parsed, NO_IMPORT_CALLBACK_MIN_VERSION)) {
|
|
167
181
|
// version >= 0.8.22
|
|
168
182
|
args.push("--no-import-callback");
|
|
169
|
-
} else if (
|
|
183
|
+
} else if (greaterThanOrEqual(parsed, BASE_PATH_MIN_VERSION)) {
|
|
170
184
|
// version >= 0.6.9
|
|
171
185
|
const tmpFolder = await mkdtemp("hardhat-solc-");
|
|
172
186
|
args.push(`--base-path`);
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
} from "@nomicfoundation/hardhat-errors";
|
|
12
12
|
import { bytesToHexString } from "@nomicfoundation/hardhat-utils/bytes";
|
|
13
13
|
import { sha256 } from "@nomicfoundation/hardhat-utils/crypto";
|
|
14
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
14
15
|
import { ensureError } from "@nomicfoundation/hardhat-utils/error";
|
|
15
16
|
import {
|
|
16
17
|
chmod,
|
|
@@ -26,11 +27,12 @@ import { getPrefixedHexString } from "@nomicfoundation/hardhat-utils/hex";
|
|
|
26
27
|
import { download } from "@nomicfoundation/hardhat-utils/request";
|
|
27
28
|
import { MultiProcessMutex } from "@nomicfoundation/hardhat-utils/synchronization";
|
|
28
29
|
import AdmZip from "adm-zip";
|
|
29
|
-
import debug from "debug";
|
|
30
30
|
|
|
31
31
|
import { NativeCompiler, SolcJsCompiler } from "./compiler.js";
|
|
32
32
|
|
|
33
|
-
const log =
|
|
33
|
+
const log = createDebug(
|
|
34
|
+
"hardhat:core:solidity:build-system:compiler:downloader",
|
|
35
|
+
);
|
|
34
36
|
|
|
35
37
|
const COMPILER_REPOSITORY_URL = "https://binaries.soliditylang.org";
|
|
36
38
|
const DEFAULT_COMPILER_DOWNLOAD_RETRY_COUNT = 3;
|
|
@@ -9,9 +9,9 @@ import {
|
|
|
9
9
|
assertHardhatInvariant,
|
|
10
10
|
HardhatError,
|
|
11
11
|
} from "@nomicfoundation/hardhat-errors";
|
|
12
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
12
13
|
import { exists, isBinaryFile } from "@nomicfoundation/hardhat-utils/fs";
|
|
13
14
|
import { getCacheDir } from "@nomicfoundation/hardhat-utils/global-dir";
|
|
14
|
-
import debug from "debug";
|
|
15
15
|
|
|
16
16
|
import { hasArm64MirrorBuild, hasOfficialArm64Build } from "../solc-info.js";
|
|
17
17
|
|
|
@@ -28,7 +28,7 @@ async function getGlobalCompilersCacheDir(): Promise<string> {
|
|
|
28
28
|
return path.join(globalCompilersCacheDir, "compilers-v3");
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const log =
|
|
31
|
+
const log = createDebug("hardhat:core:solidity:build-system:compiler");
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
34
|
* Returns true if a platform-specific build exists for the given version
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
// This wrapper was created by extracting the parts of the solc-js package
|
|
2
2
|
// (https://github.com/ethereum/solc-js) that we need to perform compilation.
|
|
3
3
|
|
|
4
|
-
import {
|
|
5
|
-
|
|
4
|
+
import type { SemverVersion } from "@nomicfoundation/hardhat-utils/fast-semver";
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
HardhatError,
|
|
8
|
+
assertHardhatInvariant,
|
|
9
|
+
} from "@nomicfoundation/hardhat-errors";
|
|
10
|
+
import {
|
|
11
|
+
greaterThanOrEqual,
|
|
12
|
+
parseVersion,
|
|
13
|
+
} from "@nomicfoundation/hardhat-utils/fast-semver";
|
|
14
|
+
|
|
15
|
+
const VERSION_6: SemverVersion = [0, 6, 0];
|
|
6
16
|
|
|
7
17
|
interface Solc {
|
|
8
18
|
cwrap<T>(ident: string, returnType: string | null, argTypes: string[]): T;
|
|
@@ -36,8 +46,13 @@ export type CompileWrapper = (input: string) => string;
|
|
|
36
46
|
|
|
37
47
|
export default function wrapper(solc: Solc): SolcWrapper {
|
|
38
48
|
const version = bindVersion(solc);
|
|
39
|
-
const
|
|
40
|
-
const
|
|
49
|
+
const rawVersion = version();
|
|
50
|
+
const parsedVersion = parseVersion(rawVersion);
|
|
51
|
+
assertHardhatInvariant(
|
|
52
|
+
parsedVersion !== undefined,
|
|
53
|
+
`Invalid solc version: ${rawVersion}`,
|
|
54
|
+
);
|
|
55
|
+
const isVersion6OrNewer = greaterThanOrEqual(parsedVersion, VERSION_6);
|
|
41
56
|
const reset = bindReset(solc);
|
|
42
57
|
const compile = bindCompile(solc, isVersion6OrNewer);
|
|
43
58
|
|
|
@@ -124,21 +139,3 @@ function bindCompile(
|
|
|
124
139
|
|
|
125
140
|
return undefined;
|
|
126
141
|
}
|
|
127
|
-
|
|
128
|
-
function versionToSemver(version: string): string {
|
|
129
|
-
// FIXME: parse more detail, but this is a good start
|
|
130
|
-
const parsed = version.match(
|
|
131
|
-
/^([0-9]+\.[0-9]+\.[0-9]+)-([0-9a-f]{8})[/*].*$/,
|
|
132
|
-
);
|
|
133
|
-
if (parsed !== null) {
|
|
134
|
-
return parsed[1] + "+commit." + parsed[2];
|
|
135
|
-
}
|
|
136
|
-
if (version.indexOf("0.1.3-0") !== -1) {
|
|
137
|
-
return "0.1.3";
|
|
138
|
-
}
|
|
139
|
-
if (version.indexOf("0.3.5-0") !== -1) {
|
|
140
|
-
return "0.3.5";
|
|
141
|
-
}
|
|
142
|
-
// assume it is already semver compatible
|
|
143
|
-
return version;
|
|
144
|
-
}
|
|
@@ -24,7 +24,10 @@ import type { Result } from "../../../../../types/utils.js";
|
|
|
24
24
|
import path from "node:path";
|
|
25
25
|
|
|
26
26
|
import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
|
|
27
|
-
import {
|
|
27
|
+
import {
|
|
28
|
+
exists,
|
|
29
|
+
TrueCasePathResolver,
|
|
30
|
+
} from "@nomicfoundation/hardhat-utils/fs";
|
|
28
31
|
import { AsyncMutex } from "@nomicfoundation/hardhat-utils/synchronization";
|
|
29
32
|
import { analyze } from "@nomicfoundation/solidity-analyzer";
|
|
30
33
|
|
|
@@ -82,6 +85,9 @@ export class ResolverImplementation implements Resolver {
|
|
|
82
85
|
*/
|
|
83
86
|
readonly #fakeRootFile: ProjectResolvedFile;
|
|
84
87
|
|
|
88
|
+
readonly #trueCasePathResolver: TrueCasePathResolver =
|
|
89
|
+
new TrueCasePathResolver();
|
|
90
|
+
|
|
85
91
|
/**
|
|
86
92
|
* Creates a new resolver.
|
|
87
93
|
*
|
|
@@ -221,6 +227,7 @@ export class ResolverImplementation implements Resolver {
|
|
|
221
227
|
}
|
|
222
228
|
|
|
223
229
|
const pathValidation = await validateFsPath(
|
|
230
|
+
this.#trueCasePathResolver,
|
|
224
231
|
this.#projectRoot,
|
|
225
232
|
relativeFilePath,
|
|
226
233
|
);
|
|
@@ -839,6 +846,7 @@ export class ResolverImplementation implements Resolver {
|
|
|
839
846
|
>
|
|
840
847
|
> {
|
|
841
848
|
const pathValidation = await validateFsPath(
|
|
849
|
+
this.#trueCasePathResolver,
|
|
842
850
|
npmPackage.rootFsPath,
|
|
843
851
|
relativeFsPathWithinPackage,
|
|
844
852
|
);
|