hardhat 3.4.1 → 3.4.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 +50 -0
- package/dist/src/cli.js +5 -5
- package/dist/src/cli.js.map +1 -1
- package/dist/src/internal/builtin-plugins/artifacts/artifact-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/artifacts/artifact-manager.js +10 -3
- package/dist/src/internal/builtin-plugins/artifacts/artifact-manager.js.map +1 -1
- 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.js +7 -7
- package/dist/src/internal/builtin-plugins/coverage/coverage-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/exports.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/coverage/exports.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/exports.js +1 -1
- package/dist/src/internal/builtin-plugins/coverage/exports.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers/accessors.d.ts +7 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/accessors.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/accessors.js +24 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/accessors.js.map +1 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/compat.d.ts +4 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/compat.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/compat.js +27 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers/compat.js.map +1 -0
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/clean.js +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/clean.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/hre.js +18 -15
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/hre.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.js +3 -3
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.js +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.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.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers/accessors.js +10 -4
- 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/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.js +18 -14
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.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 +11 -16
- 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/config-resolution.js +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/config-resolution.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.d.ts +14 -0
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.js +40 -0
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.js.map +1 -0
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.d.ts +1 -12
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js +2 -41
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.js +2 -5
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/hardfork.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.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 +4 -4
- 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 +68 -29
- 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/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.js +6 -1
- package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.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 +6 -3
- 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 +9 -7
- 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 +57 -36
- 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/init/template.d.ts.map +1 -1
- package/dist/src/internal/cli/init/template.js +5 -14
- package/dist/src/internal/cli/init/template.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.d.ts +1 -1
- package/dist/src/internal/cli/node-version.d.ts.map +1 -1
- package/dist/src/internal/cli/node-version.js +17 -10
- package/dist/src/internal/cli/node-version.js.map +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-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/sentry/reporter.js +2 -2
- package/dist/src/internal/cli/telemetry/sentry/reporter.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/subprocess.js +2 -2
- 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 +202 -58
- package/dist/src/internal/core/hook-manager.js.map +1 -1
- package/dist/src/internal/core/hre.js +2 -2
- package/dist/src/internal/core/hre.js.map +1 -1
- package/dist/src/internal/core/lazy-user-interruptions.d.ts +11 -0
- package/dist/src/internal/core/lazy-user-interruptions.d.ts.map +1 -0
- package/dist/src/internal/core/lazy-user-interruptions.js +39 -0
- package/dist/src/internal/core/lazy-user-interruptions.js.map +1 -0
- 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/cli.ts +5 -5
- package/src/internal/builtin-plugins/artifacts/artifact-manager.ts +12 -5
- package/src/internal/builtin-plugins/console/task-action.ts +4 -4
- package/src/internal/builtin-plugins/coverage/coverage-manager.ts +7 -7
- package/src/internal/builtin-plugins/coverage/exports.ts +1 -1
- package/src/internal/builtin-plugins/coverage/helpers/accessors.ts +44 -0
- package/src/internal/builtin-plugins/coverage/helpers/compat.ts +37 -0
- package/src/internal/builtin-plugins/coverage/hook-handlers/clean.ts +1 -1
- package/src/internal/builtin-plugins/coverage/hook-handlers/hre.ts +26 -16
- package/src/internal/builtin-plugins/coverage/hook-handlers/solidity.ts +3 -3
- package/src/internal/builtin-plugins/coverage/hook-handlers/test.ts +1 -1
- 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 +12 -5
- package/src/internal/builtin-plugins/gas-analytics/helpers/utils.ts +2 -2
- package/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts +29 -17
- package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts +12 -15
- package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts +11 -5
- package/src/internal/builtin-plugins/network-manager/config-resolution.ts +1 -1
- package/src/internal/builtin-plugins/network-manager/edr/edr-constants.ts +61 -0
- package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts +2 -61
- package/src/internal/builtin-plugins/network-manager/edr/types/hardfork.ts +3 -9
- package/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts +1 -1
- 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 +8 -5
- 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 +92 -52
- 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/hook-handlers/hre.ts +13 -4
- 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 +6 -3
- package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +1 -0
- package/src/internal/builtin-plugins/test/task-action.ts +13 -7
- 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 +86 -43
- package/src/internal/cli/init/package-manager.ts +8 -6
- package/src/internal/cli/init/prompt.ts +4 -3
- package/src/internal/cli/init/template.ts +22 -27
- package/src/internal/cli/main.ts +4 -3
- package/src/internal/cli/node-version.ts +20 -12
- 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-reporter/global-error-handlers.ts +2 -2
- package/src/internal/cli/telemetry/sentry/reporter.ts +2 -2
- package/src/internal/cli/telemetry/sentry/subprocess.ts +2 -2
- 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 +283 -101
- package/src/internal/core/hre.ts +2 -2
- package/src/internal/core/lazy-user-interruptions.ts +75 -0
- 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 +13 -13
- package/templates/hardhat-3/03-minimal/package.json +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers.d.ts +0 -15
- package/dist/src/internal/builtin-plugins/coverage/helpers.d.ts.map +0 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers.js +0 -35
- package/dist/src/internal/builtin-plugins/coverage/helpers.js.map +0 -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/builtin-plugins/coverage/helpers.ts +0 -63
- package/src/internal/utils/colorizer.ts +0 -9
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { styleText } from "node:util";
|
|
1
2
|
import { LogKind, CallKind, IncludeTraces } from "@nomicfoundation/edr";
|
|
2
3
|
import { bytesToHexString } from "@nomicfoundation/hardhat-utils/hex";
|
|
3
4
|
export function verbosityToIncludeTraces(verbosity) {
|
|
@@ -9,8 +10,10 @@ export function verbosityToIncludeTraces(verbosity) {
|
|
|
9
10
|
}
|
|
10
11
|
return IncludeTraces.None;
|
|
11
12
|
}
|
|
12
|
-
export function formatTraces(traces, prefix,
|
|
13
|
-
|
|
13
|
+
export function formatTraces(traces, prefix,
|
|
14
|
+
// Allow passing a custom colorize function for testing purposes
|
|
15
|
+
colorize = styleText) {
|
|
16
|
+
const lines = traces.map((trace) => formatTrace(trace, colorize));
|
|
14
17
|
const formattedTraces = formatNestedArray(lines, prefix);
|
|
15
18
|
// Remove the trailing newline
|
|
16
19
|
return formattedTraces.slice(0, -1);
|
|
@@ -32,45 +35,39 @@ function formatOutputs(outputs) {
|
|
|
32
35
|
return outputs;
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
|
-
function formatLog(log,
|
|
38
|
+
function formatLog(log,
|
|
39
|
+
// Allow passing a custom colorize function for testing purposes
|
|
40
|
+
colorize) {
|
|
36
41
|
const { parameters } = log;
|
|
37
|
-
const tag =
|
|
42
|
+
const tag = colorize("yellow", "[event]");
|
|
38
43
|
const lines = [];
|
|
39
44
|
if (Array.isArray(parameters)) {
|
|
40
45
|
const hexValues = parameters.map((bytes) => bytesToHexString(bytes));
|
|
41
46
|
const topicCount = hexValues.length - 1;
|
|
42
47
|
for (let i = 0; i < topicCount; i++) {
|
|
43
48
|
const prefix = i === 0 ? `${tag} topic 0` : ` topic ${i}`;
|
|
44
|
-
lines.push(`${prefix}: ${
|
|
49
|
+
lines.push(`${prefix}: ${colorize("cyan", hexValues[i])}`);
|
|
45
50
|
}
|
|
46
51
|
if (hexValues.length > 0) {
|
|
47
52
|
const dataPrefix = topicCount > 0 ? " data" : `${tag} data`;
|
|
48
|
-
lines.push(`${dataPrefix}: ${
|
|
53
|
+
lines.push(`${dataPrefix}: ${colorize("cyan", hexValues[hexValues.length - 1])}`);
|
|
49
54
|
}
|
|
50
55
|
}
|
|
51
56
|
else {
|
|
52
|
-
lines.push(`${tag} ${parameters.name}(${
|
|
57
|
+
lines.push(`${tag} ${parameters.name}(${colorize("cyan", parameters.arguments.join(", "))})`);
|
|
53
58
|
}
|
|
54
59
|
return lines;
|
|
55
60
|
}
|
|
56
|
-
function formatTrace(trace,
|
|
61
|
+
function formatTrace(trace, colorize) {
|
|
57
62
|
const { success, address, contract, inputs, gasUsed, value, kind, isCheatcode, outputs, } = trace;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
color = colorizer.blue;
|
|
61
|
-
}
|
|
62
|
-
else if (success) {
|
|
63
|
-
color = colorizer.green;
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
color = colorizer.red;
|
|
67
|
-
}
|
|
63
|
+
const colorName = isCheatcode ? "blue" : success ? "green" : "red";
|
|
64
|
+
const color = (text) => colorize(colorName, text);
|
|
68
65
|
const formattedInputs = formatInputs(inputs, color);
|
|
69
66
|
const formattedOutputs = formatOutputs(outputs);
|
|
70
67
|
let openingLine;
|
|
71
68
|
let closingLine;
|
|
72
69
|
if (kind === CallKind.Create) {
|
|
73
|
-
openingLine = `[${gasUsed}] ${
|
|
70
|
+
openingLine = `[${gasUsed}] ${colorize("yellow", "→ new")} ${contract ?? "<unknown>"}@${address}`;
|
|
74
71
|
// TODO: Uncomment this when the formattedInputs starts containing
|
|
75
72
|
// the address of where the contract was deployed instead of the code.
|
|
76
73
|
// if (formattedInputs !== undefined) {
|
|
@@ -86,13 +83,13 @@ function formatTrace(trace, colorizer) {
|
|
|
86
83
|
openingLine = `${openingLine} {value: ${value}}`;
|
|
87
84
|
}
|
|
88
85
|
if (kind === CallKind.StaticCall) {
|
|
89
|
-
openingLine = `${openingLine} ${
|
|
86
|
+
openingLine = `${openingLine} ${colorize("yellow", "[staticcall]")}`;
|
|
90
87
|
}
|
|
91
88
|
else if (kind === CallKind.DelegateCall) {
|
|
92
|
-
openingLine = `${openingLine} ${
|
|
89
|
+
openingLine = `${openingLine} ${colorize("yellow", "[delegatecall]")}`;
|
|
93
90
|
}
|
|
94
91
|
else if (kind === CallKind.CallCode) {
|
|
95
|
-
openingLine = `${openingLine} ${
|
|
92
|
+
openingLine = `${openingLine} ${colorize("yellow", "[callcode]")}`;
|
|
96
93
|
}
|
|
97
94
|
}
|
|
98
95
|
if (formattedOutputs !== undefined) {
|
|
@@ -108,10 +105,10 @@ function formatTrace(trace, colorizer) {
|
|
|
108
105
|
lines.push(openingLine);
|
|
109
106
|
for (const child of trace.children) {
|
|
110
107
|
if (child.kind === LogKind.Log) {
|
|
111
|
-
lines.push(formatLog(child,
|
|
108
|
+
lines.push(formatLog(child, colorize));
|
|
112
109
|
}
|
|
113
110
|
else {
|
|
114
|
-
lines.push(formatTrace(child,
|
|
111
|
+
lines.push(formatTrace(child, colorize));
|
|
115
112
|
}
|
|
116
113
|
}
|
|
117
114
|
if (closingLine !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-formatters.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"trace-formatters.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAItE,MAAM,UAAU,wBAAwB,CAAC,SAAiB;IACxD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,aAAa,CAAC,GAAG,CAAC;IAC3B,CAAC;SAAM,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QAC1B,OAAO,aAAa,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,MAAmB,EACnB,MAAc;AACd,gEAAgE;AAChE,WAA6B,SAAS;IAEtC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAClE,MAAM,eAAe,GAAG,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACzD,8BAA8B;IAC9B,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,YAAY,CACnB,MAA2C,EAC3C,KAAgC;IAEhC,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;QACjC,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,MAAM,aAAa,GACjB,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QACzD,OAAO,GAAG,aAAa,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC5D,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,OAA4B;IACjD,IAAI,OAAO,YAAY,UAAU,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAChB,GAAa;AACb,gEAAgE;AAChE,QAA0B;IAE1B,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,EAAE,CAAC;IAEjB,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC;YACzE,KAAK,CAAC,IAAI,CACR,GAAG,UAAU,KAAK,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CACtE,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CACR,GAAG,GAAG,IAAI,UAAU,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAClF,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAClB,KAAgB,EAChB,QAA0B;IAE1B,MAAM,EACJ,OAAO,EACP,OAAO,EACP,QAAQ,EACR,MAAM,EACN,OAAO,EACP,KAAK,EACL,IAAI,EACJ,WAAW,EACX,OAAO,GACR,GAAG,KAAK,CAAC;IACV,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE1D,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,WAAmB,CAAC;IACxB,IAAI,WAA+B,CAAC;IACpC,IAAI,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC7B,WAAW,GAAG,IAAI,OAAO,KAAK,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,QAAQ,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;QAClG,kEAAkE;QAClE,sEAAsE;QACtE,uCAAuC;QACvC,uDAAuD;QACvD,IAAI;IACN,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,IAAI,OAAO,KAAK,KAAK,CAAC,QAAQ,IAAI,OAAO,CAAC,EAAE,CAAC;QAC3D,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,WAAW,GAAG,GAAG,WAAW,KAAK,eAAe,EAAE,CAAC;QACrD,CAAC;QACD,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YACjB,WAAW,GAAG,GAAG,WAAW,YAAY,KAAK,GAAG,CAAC;QACnD,CAAC;QACD,IAAI,IAAI,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;YACjC,WAAW,GAAG,GAAG,WAAW,IAAI,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC;QACvE,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC1C,WAAW,GAAG,GAAG,WAAW,IAAI,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC;QACzE,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACtC,WAAW,GAAG,GAAG,WAAW,IAAI,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,CAAC;QACrE,CAAC;IACH,CAAC;IACD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,IACE,gBAAgB,KAAK,kBAAkB;YACvC,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,EACtC,CAAC;YACD,WAAW,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,gBAAgB,EAAE,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,gBAAgB,EAAE,CAAC;QACpD,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAyB,EACzB,MAAM,GAAG,EAAE,EACX,UAAU,GAAG,IAAI;IAEjB,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAErB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvD,MAAM,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;YAElC,IAAI,UAAU,EAAE,CAAC;gBACf,sCAAsC;gBACtC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACV,MAAM,IAAI,IAAI,CAAC;gBACjB,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,GAAG,KAAK,IAAI,CAAC;gBAChC,MAAM,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7C,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC/C,MAAM,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,CAAC;gBAC5C,MAAM,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,EAAE,KAAK,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,IAAI,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-output.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/trace-output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"trace-output.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/trace-output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAkCrD;;;GAGG;AACH,qBAAa,kBAAkB;;gBAQ3B,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EACnC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM;IAQnB;;;OAGG;IACI,gBAAgB,CACrB,WAAW,EAAE,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,OAAO,GACd,IAAI;IAuDP;;OAEG;IACI,iBAAiB,IAAI,IAAI;CAejC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import { styleText } from "node:util";
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
3
|
import { formatTraces } from "./trace-formatters.js";
|
|
4
|
-
const log =
|
|
4
|
+
const log = createDebug("hardhat:core:network-manager:edr:trace-output");
|
|
5
5
|
// Rotating palette for per-connection coloring of trace headers.
|
|
6
6
|
const LABEL_COLORS = [
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
(text) => styleText("cyan", text),
|
|
8
|
+
(text) => styleText("magenta", text),
|
|
9
|
+
(text) => styleText("blueBright", text),
|
|
10
|
+
(text) => styleText("yellowBright", text),
|
|
11
|
+
(text) => styleText("cyanBright", text),
|
|
12
|
+
(text) => styleText("magentaBright", text),
|
|
13
13
|
];
|
|
14
14
|
// Keyed by `network name` (not connection label) so the map stays bounded
|
|
15
15
|
// by the number of distinct networks, not the number of connections.
|
|
@@ -77,9 +77,11 @@ export class TraceOutputManager {
|
|
|
77
77
|
const coloredLabel = this.#labelColor(this.#connectionLabel);
|
|
78
78
|
const prefix = callTraces.length > 1 ? "Traces from" : "Trace from";
|
|
79
79
|
const coloredPrefix = this.#labelColor(prefix);
|
|
80
|
-
const styledMethod = failed
|
|
80
|
+
const styledMethod = failed
|
|
81
|
+
? styleText("red", method)
|
|
82
|
+
: styleText("dim", method);
|
|
81
83
|
const header = `${coloredPrefix} ${coloredLabel}: ${styledMethod}`;
|
|
82
|
-
this.#printLineFn(`${header}\n${formatTraces(callTraces, " "
|
|
84
|
+
this.#printLineFn(`${header}\n${formatTraces(callTraces, " ")}`);
|
|
83
85
|
}
|
|
84
86
|
catch (e) {
|
|
85
87
|
log("Failed to get call traces: %O", e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-output.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/trace-output.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"trace-output.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/trace-output.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
2
3
|
import { watch } from "chokidar";
|
|
3
|
-
|
|
4
|
-
const log = debug("hardhat:core:tasks:node:artifacts");
|
|
4
|
+
const log = createDebug("hardhat:core:tasks:node:artifacts");
|
|
5
5
|
const STABILITY_THRESHOLD = 250;
|
|
6
6
|
const POLL_INTERVAL = 50;
|
|
7
7
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-info-watcher.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/node/artifacts/build-info-watcher.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"build-info-watcher.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/node/artifacts/build-info-watcher.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAKjC,MAAM,GAAG,GAAG,WAAW,CAAC,mCAAmC,CAAC,CAAC;AAE7D,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,OAAyB,EACzB,YAAoB;IAEpB,GAAG,CAAC,sBAAsB,YAAY,EAAE,CAAC,CAAC;IAE1C,MAAM,eAAe,GACnB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAE3E,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,GAAG,CAAC,QAAQ,YAAY,2BAA2B,CAAC,CAAC;QACrD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAEjE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAc,EAAE,EAAE;QACpD,GAAG,CACD,uDAAuD,OAAO,GAAG,EACjE,KAAK,CACN,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,gBAAwB,EACxB,OAAyB;IAEzB,yEAAyE;IACzE,iDAAiD;IACjD,2EAA2E;IAC3E,sEAAsE;IACtE,MAAM,OAAO,GAAG,KAAK,CAAC,gBAAgB,EAAE;QACtC,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,IAAI;QACnB,gBAAgB,EAAE;YAChB,kBAAkB,EAAE,mBAAmB;YACvC,YAAY,EAAE,aAAa;SAC5B;KACF,CAAC,CAAC;IAEH,iFAAiF;IACjF,2FAA2F;IAC3F,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEhD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { EdrNetworkAccountsConfig } from "../../../types/config.js";
|
|
2
2
|
import type { EdrProvider } from "../network-manager/edr/edr-provider.js";
|
|
3
|
+
import type { DebugLogger } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
4
|
export declare function formatEdrNetworkConfigAccounts(config: EdrNetworkAccountsConfig): Promise<string>;
|
|
4
5
|
/**
|
|
5
6
|
* Creates a handler function that will be called on buildInfo file creations
|
|
@@ -11,6 +12,6 @@ export declare function formatEdrNetworkConfigAccounts(config: EdrNetworkAccount
|
|
|
11
12
|
* @param provider - The EDR provider being updated.
|
|
12
13
|
* @returns The handler function that is called with the buildId to upload.
|
|
13
14
|
*/
|
|
14
|
-
export declare function createBuildInfoUploadHandlerFrom(buildInfoDirPath: string, provider: EdrProvider, log:
|
|
15
|
+
export declare function createBuildInfoUploadHandlerFrom(buildInfoDirPath: string, provider: EdrProvider, log: DebugLogger): (buildId: string) => Promise<void>;
|
|
15
16
|
export declare function getPublicPrivateKeysWarning(): string;
|
|
16
17
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAmBxE,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAyDjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAC9C,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,WAAW,EACrB,GAAG,EAAE,WAAW,GACf,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAuCpC;AAGD,wBAAgB,2BAA2B,IAAI,MAAM,CAKpD"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
+
import { styleText } from "node:util";
|
|
2
3
|
import { readJsonFile, readJsonFileAsStream, } from "@nomicfoundation/hardhat-utils/fs";
|
|
3
4
|
import { hexStringToBytes } from "@nomicfoundation/hardhat-utils/hex";
|
|
4
|
-
import chalk from "chalk";
|
|
5
5
|
// micro-eth-signer is known to be slow to load, so we lazy load it
|
|
6
6
|
let microEthSigner;
|
|
7
7
|
import { sendErrorTelemetry } from "../../cli/telemetry/error-reporter/reporter.js";
|
|
8
|
-
import { isDefaultEdrNetworkHDAccountsConfig } from "../network-manager/edr/edr-
|
|
8
|
+
import { isDefaultEdrNetworkHDAccountsConfig } from "../network-manager/edr/edr-constants.js";
|
|
9
9
|
import { normalizeEdrNetworkAccountsConfig } from "../network-manager/edr/utils/convert-to-edr.js";
|
|
10
10
|
export async function formatEdrNetworkConfigAccounts(config) {
|
|
11
11
|
const accounts = await normalizeEdrNetworkAccountsConfig(config);
|
|
@@ -68,7 +68,7 @@ export function createBuildInfoUploadHandlerFrom(buildInfoDirPath, provider, log
|
|
|
68
68
|
log(`Added compiler result for ${buildId}`);
|
|
69
69
|
}
|
|
70
70
|
catch (error) {
|
|
71
|
-
console.warn(
|
|
71
|
+
console.warn(styleText("yellow", `There was a problem adding the new compiler result for build ${buildId}.`));
|
|
72
72
|
log("Last compilation result couldn't be added. Please report this to help us improve Hardhat.\n", error);
|
|
73
73
|
if (error instanceof Error) {
|
|
74
74
|
await sendErrorTelemetry(error);
|
|
@@ -79,6 +79,6 @@ export function createBuildInfoUploadHandlerFrom(buildInfoDirPath, provider, log
|
|
|
79
79
|
}
|
|
80
80
|
// NOTE: This function is exported for testing purposes only
|
|
81
81
|
export function getPublicPrivateKeysWarning() {
|
|
82
|
-
return
|
|
82
|
+
return styleText("bold", "WARNING: Funds sent on live network to accounts with publicly known private keys WILL BE LOST.");
|
|
83
83
|
}
|
|
84
84
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/helpers.ts"],"names":[],"mappings":"AAOA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,YAAY,EACZ,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,mEAAmE;AACnE,IAAI,cAAkD,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,mCAAmC,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,iCAAiC,EAAE,MAAM,gDAAgD,CAAC;AAEnG,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,MAAgC;IAEhC,MAAM,QAAQ,GAAG,MAAM,iCAAiC,CAAC,MAAM,CAAC,CAAC;IAEjE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,sBAAsB,GAAa,EAAE,CAAC;IAC5C,MAAM,SAAS,GACb,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACtB,CAAC,MAAM,mCAAmC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtD,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxC,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAExC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,sBAAsB,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;QAC3D,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,YAAY,KAAK,GAAG,CAAC;IAC9D,MAAM,gBAAgB,GAAG,cAAc,CAAC;IAExC,IAAI,eAAe,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAChE,IAAI,SAAS,IAAI,gBAAgB,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;QAC3D,eAAe,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,cAAc,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI;aAChC,cAAc,CAAC,gBAAgB,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;aACzE,WAAW,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEpE,sBAAsB,CAAC,IAAI,CACzB,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,OAAO,KAAK,OAAO,OAAO,CAC9E,CAAC;QACF,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,sBAAsB,CAAC,IAAI,CACzB,GAAG,gBAAgB,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,CACzF,CAAC;QACJ,CAAC;QAED,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,sBAAsB,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;QAC3D,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,gCAAgC,CAC9C,gBAAwB,EACxB,QAAqB,EACrB,GAAgB;IAEhB,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACjD,IAAI,CAAC;YACH,GAAG,CAAC,2CAA2C,OAAO,cAAc,CAAC,CAAC;YACtE,MAAM,SAAS,GAAc,MAAM,YAAY,CAC7C,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,OAAO,OAAO,CAAC,CAC/C,CAAC;YACF,MAAM,eAAe,GACnB,MAAM,oBAAoB,CACxB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,OAAO,cAAc,CAAC,CACtD,CAAC;YAEJ,MAAM,QAAQ,CAAC,oBAAoB,CACjC,SAAS,CAAC,WAAW,EACrB,SAAS,CAAC,KAAK,EACf,eAAe,CAAC,MAAM,CACvB,CAAC;YAEF,GAAG,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CACV,SAAS,CACP,QAAQ,EACR,gEAAgE,OAAO,GAAG,CAC3E,CACF,CAAC;YAEF,GAAG,CACD,6FAA6F,EAC7F,KAAK,CACN,CAAC;YAEF,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,2BAA2B;IACzC,OAAO,SAAS,CACd,MAAM,EACN,gGAAgG,CACjG,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import http from "node:http";
|
|
2
|
-
import
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
3
|
import { WebSocketServer } from "ws";
|
|
4
4
|
import { JsonRpcHandler } from "./handler.js";
|
|
5
|
-
const log =
|
|
5
|
+
const log = createDebug("hardhat:core:tasks:node:json-rpc:server");
|
|
6
6
|
export class JsonRpcServerImplementation {
|
|
7
7
|
#config;
|
|
8
8
|
#httpServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/node/json-rpc/server.ts"],"names":[],"mappings":"AAKA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/node/json-rpc/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAyBrE,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,QAAA,MAAM,UAAU,EAAE,qBAAqB,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAyBrE,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,QAAA,MAAM,UAAU,EAAE,qBAAqB,CAAC,mBAAmB,CA2I1D,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
+
import { styleText } from "node:util";
|
|
2
3
|
import { assertHardhatInvariant, HardhatError, } from "@nomicfoundation/hardhat-errors";
|
|
4
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
5
|
import { ensureDir, exists } from "@nomicfoundation/hardhat-utils/fs";
|
|
4
|
-
import chalk from "chalk";
|
|
5
|
-
import debug from "debug";
|
|
6
6
|
import { isSupportedChainType } from "../../edr/chain-type.js";
|
|
7
7
|
import { BUILD_INFO_DIR_NAME } from "../artifacts/artifact-manager.js";
|
|
8
8
|
import { EdrProvider } from "../network-manager/edr/edr-provider.js";
|
|
9
9
|
import { watchBuildInfo } from "./artifacts/build-info-watcher.js";
|
|
10
10
|
import { createBuildInfoUploadHandlerFrom, formatEdrNetworkConfigAccounts, } from "./helpers.js";
|
|
11
11
|
import { JsonRpcServerImplementation } from "./json-rpc/server.js";
|
|
12
|
-
const log =
|
|
12
|
+
const log = createDebug("hardhat:core:tasks:node");
|
|
13
13
|
const nodeAction = async (args, hre) => {
|
|
14
14
|
const network = hre.globalOptions.network !== undefined
|
|
15
15
|
? hre.globalOptions.network
|
|
@@ -88,7 +88,7 @@ const nodeAction = async (args, hre) => {
|
|
|
88
88
|
provider,
|
|
89
89
|
});
|
|
90
90
|
const { port: actualPort, address: actualHostname } = await server.listen();
|
|
91
|
-
console.log(
|
|
91
|
+
console.log(styleText("green", `Started HTTP and WebSocket JSON-RPC server at http://${actualHostname}:${actualPort}/`));
|
|
92
92
|
console.log();
|
|
93
93
|
const buildInfoDirPath = path.join(hre.config.paths.artifacts, BUILD_INFO_DIR_NAME);
|
|
94
94
|
await ensureDir(buildInfoDirPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/node/task-action.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EACL,gCAAgC,EAChC,8BAA8B,GAC/B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,GAAG,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;AAWnD,MAAM,UAAU,GAA+C,KAAK,EAClE,IAAI,EACJ,GAAG,EACH,EAAE;IACF,MAAM,OAAO,GACX,GAAG,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;QACrC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO;QAC3B,CAAC,CAAC,MAAM,CAAC;IAEb,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YACzE,WAAW,EAAE,OAAO;SACrB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC1D,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACzE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI;YAC9C,WAAW,EAAE,OAAO;SACrB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,gBAAgB,GAIlB;QACF,OAAO;KACR,CAAC;IAEF,4EAA4E;IAC5E,0EAA0E;IAC1E,qBAAqB;IACrB,MAAM,qBAAqB,GAA6B,EAAE,CAAC;IAE3D,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EACzD;gBACE,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,WAAW;aAClB,CACF,CAAC;QACJ,CAAC;QACD,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAC9C,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC/C,CAAC;IAED,iEAAiE;IACjE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,qBAAqB,CAAC,OAAO,GAAG;YAC9B,OAAO,EAAE,IAAI;YACb,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,GAAG,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,CAAC;gBAC7B,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,eAAe,EAAE;gBACvC,CAAC,CAAC,SAAS,CAAC;SACf,CAAC;IACJ,CAAC;SAAM,IAAI,IAAI,CAAC,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;QACvC,oDAAoD;QACpD,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAC7D;YACE,QAAQ,EAAE,MAAM;SACjB,CACF,CAAC;IACJ,CAAC;IAED,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAC/B,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAE7C,sBAAsB,CACpB,QAAQ,YAAY,WAAW,EAC/B,qEAAqE,CACtE,CAAC;IAEF,uCAAuC;IACvC,MAAM,QAAQ,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,2BAA2B;QACnC,MAAM,EAAE,CAAC,IAAI,CAAC;KACf,CAAC,CAAC;IAEH,oEAAoE;IACpE,2CAA2C;IAC3C,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC7B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,GAAG,SAAS,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,2BAA2B,CAAC;QAC7C,QAAQ;QACR,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;IAE5E,OAAO,CAAC,GAAG,CACT,SAAS,CACP,OAAO,EACP,wDAAwD,cAAc,IAAI,UAAU,GAAG,CACxF,CACF,CAAC;IAEF,OAAO,CAAC,GAAG,EAAE,CAAC;IAEd,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAChC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAC1B,mBAAmB,CACpB,CAAC;IACF,MAAM,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAElC,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAC3C,gBAAgB,EAChB,gCAAgC,CAAC,gBAAgB,EAAE,QAAQ,EAAE,GAAG,CAAC,CAClE,CAAC;IAEF,uFAAuF;IACvF,wGAAwG;IACxG,sBAAsB,CACpB,aAAa,CAAC,IAAI,KAAK,eAAe,EACtC,mCAAmC,CACpC,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,MAAM,8BAA8B,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE1E,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;IAC3B,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-system.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,sBAAsB,EACtB,0BAA0B,EAC1B,cAAc,EACf,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,2BAA2B,EAC3B,eAAe,EACf,yBAAyB,EACzB,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,uBAAuB,EACvB,UAAU,EAEX,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAEV,cAAc,EAEd,cAAc,EACd,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"build-system.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import os from "node:os";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { styleText } from "node:util";
|
|
3
4
|
import { assertHardhatInvariant, HardhatError, } from "@nomicfoundation/hardhat-errors";
|
|
4
|
-
import {
|
|
5
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
6
|
+
import { exists, ensureDir, getAllDirectoriesMatching, getAllFilesMatching, move, readJsonFile, remove, writeJsonFile, writeJsonFileAsStream, writeUtf8File, readdirOrEmpty, } from "@nomicfoundation/hardhat-utils/fs";
|
|
5
7
|
import { shortenPath } from "@nomicfoundation/hardhat-utils/path";
|
|
6
8
|
import { createSpinner } from "@nomicfoundation/hardhat-utils/spinner";
|
|
7
9
|
import { pluralize } from "@nomicfoundation/hardhat-utils/string";
|
|
8
|
-
import chalk from "chalk";
|
|
9
|
-
import debug from "debug";
|
|
10
10
|
import pMap from "p-map";
|
|
11
11
|
import { FileBuildResultType } from "../../../../types/solidity/build-system.js";
|
|
12
12
|
import { getHardhatVersion } from "../../../utils/package.js";
|
|
@@ -14,6 +14,7 @@ import { DEFAULT_BUILD_PROFILE } from "../build-profiles.js";
|
|
|
14
14
|
import { getSolcCompilerForConfig } from "../solidity-hooks.js";
|
|
15
15
|
import { getArtifactsDeclarationFile, getBuildInfo, getBuildInfoOutput, getContractArtifact, getDuplicatedContractNamesDeclarationFile, } from "./artifacts.js";
|
|
16
16
|
import { loadCache, saveCache } from "./cache.js";
|
|
17
|
+
import { sortCompilationJobsByDescendingCost } from "./compilation-job-cost.js";
|
|
17
18
|
import { CompilationJobImplementation } from "./compilation-job.js";
|
|
18
19
|
import { downloadSolcCompilers, getCompiler } from "./compiler/index.js";
|
|
19
20
|
import { buildDependencyGraph } from "./dependency-graph-building.js";
|
|
@@ -21,7 +22,7 @@ import { readSourceFileFactory } from "./read-source-file.js";
|
|
|
21
22
|
import { formatRootPath, isNpmParsedRootPath, npmModuleToNpmRootPath, parseRootPath, } from "./root-paths-utils.js";
|
|
22
23
|
import { SolcConfigSelector } from "./solc-config-selection.js";
|
|
23
24
|
import { shouldSuppressWarning } from "./warning-suppression.js";
|
|
24
|
-
const log =
|
|
25
|
+
const log = createDebug("hardhat:core:solidity:build-system");
|
|
25
26
|
/**
|
|
26
27
|
* Returns true if the given compiler config is a SolcSolidityCompilerConfig.
|
|
27
28
|
*/
|
|
@@ -76,34 +77,30 @@ export class SolidityBuildSystemImplementation {
|
|
|
76
77
|
}
|
|
77
78
|
async getRootFilePaths(options = {}) {
|
|
78
79
|
const scope = options.scope ?? "contracts";
|
|
79
|
-
const unified = !this.#options.solidityConfig.splitTestsCompilation;
|
|
80
80
|
this.#ensureSplitCompilationModeIfTestsScope(scope);
|
|
81
|
+
const unified = !this.#options.solidityConfig.splitTestsCompilation;
|
|
82
|
+
const { localContractFiles, sourceTestFiles } = await this.#getSoliditySourcesRootFilePaths();
|
|
81
83
|
switch (scope) {
|
|
82
84
|
case "contracts": {
|
|
83
|
-
const localContractFiles = (await Promise.all(this.#options.soliditySourcesPaths.map((dir) => getAllFilesMatching(dir, (f) => f.endsWith(".sol") && !f.endsWith(".t.sol"))))).flat(1);
|
|
84
85
|
const npmFilesToBuild = this.#options.solidityConfig.npmFilesToBuild.map(npmModuleToNpmRootPath);
|
|
85
86
|
if (!unified) {
|
|
86
87
|
return [...localContractFiles, ...npmFilesToBuild];
|
|
87
88
|
}
|
|
88
89
|
// In unified mode, contracts scope returns all roots: contracts,
|
|
89
90
|
// tests, and npm files.
|
|
90
|
-
const testFiles =
|
|
91
|
-
getAllFilesMatching(this.#options.solidityTestsPath, (f) => f.endsWith(".sol")),
|
|
92
|
-
...
|
|
93
|
-
|
|
94
|
-
}),
|
|
95
|
-
])).flat(1);
|
|
91
|
+
const testFiles = [
|
|
92
|
+
...(await getAllFilesMatching(this.#options.solidityTestsPath, (f) => f.endsWith(".sol"))),
|
|
93
|
+
...sourceTestFiles,
|
|
94
|
+
];
|
|
96
95
|
// Remove duplicates in case there is an intersection between
|
|
97
96
|
// the tests.solidity paths and the sources paths
|
|
98
97
|
return Array.from(new Set([...localContractFiles, ...npmFilesToBuild, ...testFiles]));
|
|
99
98
|
}
|
|
100
99
|
case "tests": {
|
|
101
|
-
let rootFilePaths =
|
|
102
|
-
getAllFilesMatching(this.#options.solidityTestsPath, (f) => f.endsWith(".sol")),
|
|
103
|
-
...
|
|
104
|
-
|
|
105
|
-
}),
|
|
106
|
-
])).flat(1);
|
|
100
|
+
let rootFilePaths = [
|
|
101
|
+
...(await getAllFilesMatching(this.#options.solidityTestsPath, (f) => f.endsWith(".sol"))),
|
|
102
|
+
...sourceTestFiles,
|
|
103
|
+
];
|
|
107
104
|
// NOTE: We remove duplicates in case there is an intersection between
|
|
108
105
|
// the tests.solidity paths and the sources paths
|
|
109
106
|
rootFilePaths = Array.from(new Set(rootFilePaths));
|
|
@@ -111,6 +108,31 @@ export class SolidityBuildSystemImplementation {
|
|
|
111
108
|
}
|
|
112
109
|
}
|
|
113
110
|
}
|
|
111
|
+
/**
|
|
112
|
+
* Returns all the root files from the different solidity source dirs in the
|
|
113
|
+
* config, partitioned into contract files and test files according to their
|
|
114
|
+
* extensions.
|
|
115
|
+
*/
|
|
116
|
+
async #getSoliditySourcesRootFilePaths() {
|
|
117
|
+
const sourceFileGroups = await Promise.all(this.#options.soliditySourcesPaths.map(async (dir) => {
|
|
118
|
+
const localSolidityFiles = await getAllFilesMatching(dir, (f) => f.endsWith(".sol"));
|
|
119
|
+
const localContractFiles = [];
|
|
120
|
+
const sourceTestFiles = [];
|
|
121
|
+
for (const file of localSolidityFiles) {
|
|
122
|
+
if (file.endsWith(".t.sol")) {
|
|
123
|
+
sourceTestFiles.push(file);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
localContractFiles.push(file);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
return { localContractFiles, sourceTestFiles };
|
|
130
|
+
}));
|
|
131
|
+
return {
|
|
132
|
+
localContractFiles: sourceFileGroups.flatMap(({ localContractFiles }) => localContractFiles),
|
|
133
|
+
sourceTestFiles: sourceFileGroups.flatMap(({ sourceTestFiles }) => sourceTestFiles),
|
|
134
|
+
};
|
|
135
|
+
}
|
|
114
136
|
isSuccessfulBuildResult(buildResult) {
|
|
115
137
|
return buildResult instanceof Map;
|
|
116
138
|
}
|
|
@@ -147,7 +169,14 @@ export class SolidityBuildSystemImplementation {
|
|
|
147
169
|
// NOTE: We precompute the build ids in parallel here, which are cached
|
|
148
170
|
// internally in each compilation job
|
|
149
171
|
await Promise.all(runnableCompilationJobs.map(async (runnableCompilationJob) => await runnableCompilationJob.getBuildId()));
|
|
150
|
-
|
|
172
|
+
// We sort the compilation jobs in descending order of estimated
|
|
173
|
+
// compilation cost. This way we can use this algorithm:
|
|
174
|
+
// https://en.wikipedia.org/wiki/Longest-processing-time-first_scheduling
|
|
175
|
+
//
|
|
176
|
+
// Note that it works because pMap schedules the jobs in the order they
|
|
177
|
+
// are in the array.
|
|
178
|
+
const sortedCompilationJobs = sortCompilationJobsByDescendingCost(runnableCompilationJobs);
|
|
179
|
+
const results = await pMap(sortedCompilationJobs, async (runnableCompilationJob) => {
|
|
151
180
|
const { output, compiler } = await this.runCompilationJob(runnableCompilationJob, resolvedOptions);
|
|
152
181
|
return {
|
|
153
182
|
compilationJob: runnableCompilationJob,
|
|
@@ -572,13 +601,22 @@ export class SolidityBuildSystemImplementation {
|
|
|
572
601
|
return artifact.buildInfoId;
|
|
573
602
|
}));
|
|
574
603
|
const reachableBuildInfoIdsSet = new Set(reachableBuildInfoIds.filter((id) => id !== undefined));
|
|
575
|
-
//
|
|
576
|
-
|
|
604
|
+
// The build-info directory is expected to be flat: every build-info file
|
|
605
|
+
// lives directly under it, so a non-recursive `readdir` is enough.
|
|
606
|
+
const buildInfoFiles = await readdirOrEmpty(buildInfosDir);
|
|
577
607
|
for (const buildInfoFile of buildInfoFiles) {
|
|
578
|
-
|
|
579
|
-
|
|
608
|
+
let id;
|
|
609
|
+
if (buildInfoFile.endsWith(".output.json")) {
|
|
610
|
+
id = buildInfoFile.slice(0, -".output.json".length);
|
|
611
|
+
}
|
|
612
|
+
else if (buildInfoFile.endsWith(".json")) {
|
|
613
|
+
id = buildInfoFile.slice(0, -".json".length);
|
|
614
|
+
}
|
|
615
|
+
else {
|
|
616
|
+
continue;
|
|
617
|
+
}
|
|
580
618
|
if (!reachableBuildInfoIdsSet.has(id)) {
|
|
581
|
-
await remove(buildInfoFile);
|
|
619
|
+
await remove(path.join(buildInfosDir, buildInfoFile));
|
|
582
620
|
}
|
|
583
621
|
}
|
|
584
622
|
// These steps only apply when compiling contracts
|
|
@@ -717,18 +755,19 @@ export class SolidityBuildSystemImplementation {
|
|
|
717
755
|
const errorMessage = this.#getFormattedInternalCompilerErrorMessage(error) ??
|
|
718
756
|
error.formattedMessage ??
|
|
719
757
|
error.message;
|
|
720
|
-
console.error(errorMessage
|
|
721
|
-
"
|
|
758
|
+
console.error(errorMessage
|
|
759
|
+
.replace(/^\w+:/, (t) => styleText(["red", "bold"], t))
|
|
760
|
+
.trimEnd() + "\n");
|
|
722
761
|
}
|
|
723
762
|
else {
|
|
724
763
|
console.warn((error.formattedMessage ?? error.message)
|
|
725
|
-
.replace(/^\w+:/, (t) =>
|
|
764
|
+
.replace(/^\w+:/, (t) => styleText(["yellow", "bold"], t))
|
|
726
765
|
.trimEnd() + "\n");
|
|
727
766
|
}
|
|
728
767
|
}
|
|
729
768
|
const hasConsoleErrors = filteredErrors.some((e) => this.#isConsoleLogError(e));
|
|
730
769
|
if (hasConsoleErrors) {
|
|
731
|
-
console.error(
|
|
770
|
+
console.error(styleText("red", `The console.log call you made isn't supported. See https://hardhat.org/console-log for the list of supported methods.`));
|
|
732
771
|
console.log();
|
|
733
772
|
}
|
|
734
773
|
}
|
|
@@ -791,7 +830,7 @@ export class SolidityBuildSystemImplementation {
|
|
|
791
830
|
const compilerVersion = longVersion.split("+")[0];
|
|
792
831
|
compilerLabel = `${compilerType} ${compilerVersion} (Solidity ${solidityVersion})`;
|
|
793
832
|
}
|
|
794
|
-
console.log(
|
|
833
|
+
console.log(styleText("bold", `Compiled ${rootFiles} Solidity ${pluralize(options.scope === "contracts" ? "file" : "test file", rootFiles)} with ${compilerLabel}`), `(evm target: ${evmVersion})`);
|
|
795
834
|
}
|
|
796
835
|
}
|
|
797
836
|
}
|