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,10 +1,10 @@
|
|
|
1
1
|
import os from "node:os";
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
2
3
|
import { spawnDetachedSubProcess } from "@nomicfoundation/hardhat-utils/subprocess";
|
|
3
|
-
import debug from "debug";
|
|
4
4
|
import { getHardhatVersion } from "../../../utils/package.js";
|
|
5
5
|
import { isTelemetryAllowedInEnvironment, isTelemetryAllowed, } from "../telemetry-permissions.js";
|
|
6
6
|
import { getAnalyticsClientId } from "./utils.js";
|
|
7
|
-
const log =
|
|
7
|
+
const log = createDebug("hardhat:core:cli:telemetry:analytics");
|
|
8
8
|
const SESSION_ID = Math.random().toString();
|
|
9
9
|
const ENGAGEMENT_TIME_MSEC = "10000";
|
|
10
10
|
// Return a boolean for testing purposes to verify that analytics are not sent in CI environments
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/analytics/analytics.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/analytics/analytics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
2
3
|
import { exists, readJsonFile, writeJsonFile, } from "@nomicfoundation/hardhat-utils/fs";
|
|
3
4
|
import { getTelemetryDir } from "@nomicfoundation/hardhat-utils/global-dir";
|
|
4
|
-
|
|
5
|
-
const log = debug("hardhat:cli:telemetry:analytics:utils");
|
|
5
|
+
const log = createDebug("hardhat:core:cli:telemetry:analytics:utils");
|
|
6
6
|
const ANALYTICS_FILE_NAME = "analytics.json";
|
|
7
7
|
export async function getAnalyticsClientId() {
|
|
8
8
|
let clientId = await readAnalyticsClientId();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/analytics/utils.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,MAAM,EACN,YAAY,EACZ,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/analytics/utils.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,MAAM,EACN,YAAY,EACZ,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAE5E,MAAM,GAAG,GAAG,WAAW,CAAC,4CAA4C,CAAC,CAAC;AAEtE,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,IAAI,QAAQ,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAE7C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,GAAG,CAAC,2CAA2C,CAAC,CAAC;QAEjD,QAAQ,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC/B,MAAM,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,qBAAqB;IAClC,MAAM,kBAAkB,GAAG,MAAM,eAAe,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;IAEpE,GAAG,CAAC,4BAA4B,QAAQ,GAAG,CAAC,CAAC;IAE7C,IAAI,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,IAAI,GAAkB,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;IAEzC,GAAG,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;IAEpC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,QAAgB;IACpD,MAAM,kBAAkB,GAAG,MAAM,eAAe,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;IACpE,MAAM,aAAa,CAAC,QAAQ,EAAE;QAC5B,SAAS,EAAE;YACT,QAAQ;SACT;KACF,CAAC,CAAC;IAEH,GAAG,CAAC,oBAAoB,QAAQ,GAAG,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
1
2
|
import { isObject } from "@nomicfoundation/hardhat-utils/lang";
|
|
2
|
-
import debug from "debug";
|
|
3
3
|
import { sendErrorTelemetry } from "./reporter.js";
|
|
4
|
-
const log =
|
|
4
|
+
const log = createDebug("hardhat:core:cli:telemetry:global-error-handlers");
|
|
5
5
|
function createUnhandledErrorListener(isPromiseRejection) {
|
|
6
6
|
const description = isPromiseRejection
|
|
7
7
|
? "Unhandled promise rejection"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-error-handlers.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/error-reporter/global-error-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"global-error-handlers.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/error-reporter/global-error-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,GAAG,GAAG,WAAW,CAAC,kDAAkD,CAAC,CAAC;AAE5E,SAAS,4BAA4B,CAAC,kBAA2B;IAC/D,MAAM,WAAW,GAAG,kBAAkB;QACpC,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,oBAAoB,CAAC;IAEzB,MAAM,aAAa,GAAG,kBAAkB;QACtC,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,qBAAqB,CAAC;IAE1B,KAAK,UAAU,QAAQ,CAAC,KAAsB;QAC5C,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAExB,MAAM,cAAc,GAClB,KAAK,YAAY,KAAK;YACpB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI,KAAK,CACP,QAAQ,CAAC,KAAK,CAAC;gBACf,SAAS,IAAI,KAAK;gBAClB,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;gBAC/B,CAAC,CAAC,KAAK,CAAC,OAAO;gBACf,CAAC,CAAC,eAAe,EACnB,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;QAER,IAAI,CAAC;YACH,MAAM,kBAAkB,CAAC,cAAc,EAAE;gBACvC,SAAS,EAAE,IAAI;gBACf,aAAa;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,4BAA4B,EAAE,CAAC;YACtC,GAAG,CACD,8CAA8C,EAC9C,4BAA4B,CAC7B,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC;QACjC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iCAAiC;IAC/C,GAAG,CAAC,4CAA4C,CAAC,CAAC;IAElD,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { HardhatError, HardhatPluginError, } from "@nomicfoundation/hardhat-errors";
|
|
2
|
-
import
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
3
|
import { ProviderError, UnknownError, } from "../../../builtin-plugins/network-manager/provider-errors.js";
|
|
4
4
|
import { UsingHardhat2PluginError } from "../../../using-hardhat2-plugin-errors.js";
|
|
5
5
|
import { getHardhatVersion } from "../../../utils/package.js";
|
|
6
6
|
import { isTelemetryAllowed } from "../telemetry-permissions.js";
|
|
7
|
-
const log =
|
|
7
|
+
const log = createDebug("hardhat:core:cli:telemetry:sentry:reporter");
|
|
8
8
|
// export const SENTRY_DSN =
|
|
9
9
|
// "https://d578a176729662a28e7a8da268d36912@o385026.ingest.us.sentry.io/4507685793103872"; // DEV
|
|
10
10
|
export const SENTRY_DSN = "https://572b03708e298427cc72fc26dac1e8b2@o385026.ingest.us.sentry.io/4508780138856448"; // PROD
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/reporter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/reporter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EACL,aAAa,EACb,YAAY,GACb,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,GAAG,GAAG,WAAW,CAAC,4CAA4C,CAAC,CAAC;AAEtE,4BAA4B;AAC5B,oGAAoG;AACpG,MAAM,CAAC,MAAM,UAAU,GACrB,uFAAuF,CAAC,CAAC,OAAO;AAElG;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAY,EACZ,IAAsD;IAEtD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC9C,OAAO,MAAM,QAAQ,CAAC,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,UAAkB;IACxD,QAAQ,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,kBAAkB;IAChC,QAAQ,CAAC,cAAc,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,QAAQ;IACZ,uBAAuB;IACvB,mGAAmG;IACnG,gFAAgF;IAChF,sIAAsI;IAEtI,MAAM,CAAC,kBAAkB,CAAU;IACnC,MAAM,CAAC,SAAS,CAAuB;IAC9B,iBAAiB,CAAU;IAEpC,YAAoB,gBAAyB;QAC3C,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,UAAkB;QACnD,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW;QAC7B,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,EAAE,CAAC;QACpD,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAEhD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,6DAA6D;YAC7D,GAAG,CAAC,2DAA2D,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;QAED,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAEtC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACjD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3C,MAAM,EAAE,8BAA8B,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE1E,MAAM,OAAO,GAAG,WAAW,cAAc,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC;YACH,GAAG,EAAE,UAAU;YACf,SAAS,EAAE,8BAA8B,CACvC,UAAU,EACV,OAAO,EACP,WAAW,EACX,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAC9B;YACD,OAAO;YACP,WAAW;SACZ,CAAC,CAAC;QAEH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAE3C,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,MAAM,CAAC,cAAc;QAC1B,8BAA8B;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,wBAAwB,CACnC,KAAY,EACZ,IAAsD;QAEtD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,2DAA2D,CAAC,CAAC;YACjE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAEjE,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAE3B,gBAAgB,CACd,KAAK,EACL,IAAI,KAAK,SAAS;YAChB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,IAAI,EAAE,IAAI,CAAC,aAAa,IAAI,SAAS;oBACrC,OAAO,EAAE,IAAI,CAAC,SAAS,KAAK,IAAI;iBACjC;aACF;YACH,CAAC,CAAC,SAAS,CACd,CAAC;QACF,MAAM,KAAK,EAAE,CAAC;QAEd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,KAAY;QAClC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,YAAY,CAAC,cAAc,CAAC,KAAK,CAAC;YAClC,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,EAClC,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,KAAK,YAAY,wBAAwB,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,kBAAkB,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,4CAA4C;YAC5C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC;YACpC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,EAChC,CAAC;YACD,+CAA+C;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/* eslint-disable no-restricted-syntax -- Allow top-level await */
|
|
2
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
2
3
|
import { captureMessage, close, captureException } from "@sentry/core";
|
|
3
|
-
import debug from "debug";
|
|
4
4
|
import { Anonymizer } from "./anonymizer.js";
|
|
5
5
|
import { init } from "./init.js";
|
|
6
6
|
import { createHttpTransport, sendEnvelopeToSentryBackend, } from "./transport.js";
|
|
7
|
-
const log =
|
|
7
|
+
const log = createDebug("hardhat:core:cli:telemetry:sentry:subprocess");
|
|
8
8
|
const serializedEnvelope = process.argv[2];
|
|
9
9
|
const configPath = process.argv[3] !== "" ? process.argv[3] : undefined;
|
|
10
10
|
const dsn = process.argv[4];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subprocess.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/subprocess.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"subprocess.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/subprocess.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,gBAAgB,CAAC;AAExB,MAAM,GAAG,GAAG,WAAW,CAAC,8CAA8C,CAAC,CAAC;AAExE,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,KAAK,CACX,+GAA+G,CAChH,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAChC,GAAG,CAAC,0DAA0D,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,GAAG;IACH,OAAO;IACP,SAAS,EAAE,mBAAmB,CAAC,GAAG,CAAC;IACnC,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAEhD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AAE9C,MAAM,gBAAgB,GACpB,UAAU,CAAC,+CAA+C,CAAC,QAAQ,CAAC,CAAC;AAEvE,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IACrC,GAAG,CAAC,+DAA+D,CAAC,CAAC;AACvE,CAAC;KAAM,CAAC;IACN,MAAM,eAAe,GACnB,MAAM,UAAU,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAEjE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QAC7B,GAAG,CAAC,8BAA8B,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAC3D,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,GAAG,CAAC,qCAAqC,CAAC,CAAC;YAE3C,MAAM,2BAA2B,CAAC,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;YAEjE,GAAG,CAAC,+CAA+C,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAC;YAErD,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,KAAK,EAAE,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { fileURLToPath } from "node:url";
|
|
3
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
4
|
import { createTransport, serializeEnvelope } from "@sentry/core";
|
|
4
|
-
|
|
5
|
-
const log = debug("hardhat:core:sentry:transport");
|
|
5
|
+
const log = createDebug("hardhat:core:cli:telemetry:sentry:transport");
|
|
6
6
|
/**
|
|
7
7
|
* Creates a detached process transport.
|
|
8
8
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/transport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { isCi } from "@nomicfoundation/hardhat-utils/ci";
|
|
3
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
3
4
|
import { exists, readJsonFile, writeJsonFile, } from "@nomicfoundation/hardhat-utils/fs";
|
|
4
5
|
import { getTelemetryDir } from "@nomicfoundation/hardhat-utils/global-dir";
|
|
5
|
-
import debug from "debug";
|
|
6
6
|
import { sendTelemetryConfigAnalytics } from "./analytics/analytics.js";
|
|
7
|
-
const log =
|
|
7
|
+
const log = createDebug("hardhat:core:cli:telemetry:permissions");
|
|
8
8
|
/**
|
|
9
9
|
* Checks whether telemetry is supported in the current environment and whether the user did not explicitly disable it.
|
|
10
10
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry-permissions.js","sourceRoot":"","sources":["../../../../../src/internal/cli/telemetry/telemetry-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EACL,MAAM,EACN,YAAY,EACZ,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry-permissions.js","sourceRoot":"","sources":["../../../../../src/internal/cli/telemetry/telemetry-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,MAAM,EACN,YAAY,EACZ,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAE5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAExE,MAAM,GAAG,GAAG,WAAW,CAAC,wCAAwC,CAAC,CAAC;AAMlE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,uBAAgC;IAEhC,IAAI,CAAC,+BAA+B,EAAE,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8BAA8B;IAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,SAAS,EAAE,CAAC;QAC7D,OAAO,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9E,CAAC;IAED,OAAO,MAAM,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,+BAA+B;IAC7C,MAAM,OAAO,GACX,CAAC,CAAC,IAAI,EAAE;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI;QAC7B,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,MAAM,CAAC;QACnD,wDAAwD;QACxD,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,MAAM,CAAC;IAEtD,GAAG,CAAC,oDAAoD,OAAO,EAAE,CAAC,CAAC;IAEnE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,kBAAkB,CAC/B,uBAAgC;IAEhC,uBAAuB,KAAK,MAAM,0BAA0B,EAAE,CAAC;IAE/D,GAAG,CAAC,wCAAwC,uBAAuB,EAAE,CAAC,CAAC;IAEvE,IAAI,MAAM,MAAM,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC1C,sEAAsE;QACtE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,YAAY,CACpC,uBAAuB,CACxB,CAAC;QACF,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;QAE3C,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,+DAA+D,CAAC,CAAC;IAErE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,0BAA0B;IACvC,MAAM,SAAS,GAAG,MAAM,eAAe,EAAE,CAAC;IAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAAc;IACtD,GAAG,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;IAEjD,MAAM,aAAa,CAAC,MAAM,0BAA0B,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAE5E,MAAM,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAE1C,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { fileURLToPath, pathToFileURL } from "node:url";
|
|
3
3
|
import { HardhatError } from "@nomicfoundation/hardhat-errors";
|
|
4
|
+
import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
|
|
4
5
|
import { ensureError } from "@nomicfoundation/hardhat-utils/error";
|
|
5
6
|
import { exists, findUp, getRealPath } from "@nomicfoundation/hardhat-utils/fs";
|
|
6
7
|
import { isObject } from "@nomicfoundation/hardhat-utils/lang";
|
|
7
8
|
import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
|
|
8
|
-
|
|
9
|
-
const log = debug("hardhat:core:config-loading");
|
|
9
|
+
const log = createDebug("hardhat:core:config-loading");
|
|
10
10
|
/**
|
|
11
11
|
* This cache stores any `.ts` files compiled using `tsImport`.
|
|
12
12
|
* Since this method does not cache compiled files by default, we implement our own caching mechanism.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/config-loading.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/config-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-manager.d.ts","sourceRoot":"","sources":["../../../../src/internal/core/hook-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,WAAW,EACX,iBAAiB,IAAI,iBAAiB,EACtC,wBAAwB,EACxB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"hook-manager.d.ts","sourceRoot":"","sources":["../../../../src/internal/core/hook-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,WAAW,EACX,iBAAiB,IAAI,iBAAiB,EACtC,wBAAwB,EACxB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAWlE,qBAAa,yBAA0B,YAAW,WAAW;;gBAmE/C,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE;IA4BlD,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;IAItC,gBAAgB,CAAC,iBAAiB,SAAS,MAAM,YAAY,EAClE,gBAAgB,EAAE,iBAAiB,EACnC,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,GAC5D,IAAI;IAYA,kBAAkB,CAAC,iBAAiB,SAAS,MAAM,YAAY,EACpE,gBAAgB,EAAE,iBAAiB,EACnC,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,GAC5D,IAAI;IAcM,eAAe,CAC1B,iBAAiB,SAAS,MAAM,YAAY,EAC5C,SAAS,SAAS,MAAM,YAAY,CAAC,iBAAiB,CAAC,EACvD,KAAK,SAAS,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,EAErE,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,wBAAwB,CAAC,iBAAiB,EAAE,KAAK,CAAC,EAC1D,qBAAqB,EAAE,aAAa,CAAC,KAAK,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAoD1D,qBAAqB,CAChC,iBAAiB,SAAS,MAAM,YAAY,EAC5C,SAAS,SAAS,MAAM,YAAY,CAAC,iBAAiB,CAAC,EACvD,KAAK,SAAS,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,EAExD,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC,GAClD,OAAO,CACR,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CACnE;IA0BY,mBAAmB,CAC9B,iBAAiB,SAAS,MAAM,YAAY,EAC5C,SAAS,SAAS,MAAM,YAAY,CAAC,iBAAiB,CAAC,EACvD,KAAK,SAAS,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,EAExD,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC,GAClD,OAAO,CACR,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CACnE;IAwBY,WAAW,CACtB,iBAAiB,SAAS,MAAM,YAAY,EAC5C,SAAS,SAAS,MAAM,YAAY,CAAC,iBAAiB,CAAC,EAEvD,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,OAAO,CAAC;CA6OpB"}
|
|
@@ -1,29 +1,75 @@
|
|
|
1
|
-
import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
|
|
1
|
+
import { assertHardhatInvariant, HardhatError, } from "@nomicfoundation/hardhat-errors";
|
|
2
2
|
import { ensureError } from "@nomicfoundation/hardhat-utils/error";
|
|
3
3
|
import { AsyncMutex } from "@nomicfoundation/hardhat-utils/synchronization";
|
|
4
4
|
import { detectPluginNpmDependencyProblems } from "./plugins/detect-plugin-npm-dependency-problems.js";
|
|
5
5
|
export class HookManagerImplementation {
|
|
6
6
|
#mutex = new AsyncMutex();
|
|
7
7
|
#projectRoot;
|
|
8
|
-
#pluginsInReverseOrder;
|
|
9
8
|
/**
|
|
9
|
+
* The context passed to hook handlers, except to the `config` ones, to break
|
|
10
|
+
* a circular dependency between the config and the hook handler.
|
|
11
|
+
*
|
|
10
12
|
* Initially `undefined` to be able to run the config hooks during
|
|
11
13
|
* initialization.
|
|
12
14
|
*/
|
|
13
15
|
#context;
|
|
14
16
|
/**
|
|
15
|
-
*
|
|
17
|
+
* Plugins that provide hook handlers for each category, in reverse order.
|
|
18
|
+
*
|
|
19
|
+
* Precomputed from the plugin list at construction.
|
|
20
|
+
*/
|
|
21
|
+
#pluginsByHookCategory = new Map();
|
|
22
|
+
/**
|
|
23
|
+
* Cached resolved category objects per hook category in reverse plugin
|
|
24
|
+
* order.
|
|
25
|
+
*
|
|
26
|
+
* Only written by #getStaticHookHandlerCategories, which uses a mutex to
|
|
27
|
+
* ensure that every Hook Category Factory is run once per HookManager
|
|
28
|
+
* instance.
|
|
16
29
|
*/
|
|
17
|
-
#
|
|
30
|
+
#resolvedStaticCategories = new Map();
|
|
18
31
|
/**
|
|
19
32
|
* A map of the dynamically registered handler categories.
|
|
20
33
|
*
|
|
21
34
|
* Each array is a list of categories, in reverse order of registration.
|
|
35
|
+
*
|
|
36
|
+
* Written by registerHandlers and unregisterHandlers.
|
|
22
37
|
*/
|
|
23
38
|
#dynamicHookHandlerCategories = new Map();
|
|
39
|
+
/**
|
|
40
|
+
* Cached combined (dynamic + static) handlers per (category, hook name) in
|
|
41
|
+
* chained running order.
|
|
42
|
+
*
|
|
43
|
+
* Only written by #getHandlersInChainedRunningOrder, and invalidated
|
|
44
|
+
* per-category on dynamic handlers register/unregister.
|
|
45
|
+
*/
|
|
46
|
+
#chainedHandlers = new Map();
|
|
47
|
+
/**
|
|
48
|
+
* Cached combined handlers per (category, hook name) in sequential running
|
|
49
|
+
* order (reverse of chained).
|
|
50
|
+
*
|
|
51
|
+
* Only written by #getHandlersInSequentialRunningOrder, and invalidated
|
|
52
|
+
* per-category on dynamic handlers register/unregister.
|
|
53
|
+
*/
|
|
54
|
+
#sequentialHandlers = new Map();
|
|
24
55
|
constructor(projectRoot, plugins) {
|
|
25
56
|
this.#projectRoot = projectRoot;
|
|
26
|
-
|
|
57
|
+
for (const plugin of plugins.toReversed()) {
|
|
58
|
+
if (plugin.hookHandlers === undefined) {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
for (const hookCategoryName of Object.keys(plugin.hookHandlers)) {
|
|
62
|
+
if (plugin.hookHandlers[hookCategoryName] === undefined) {
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
65
|
+
let pluginsForCategory = this.#pluginsByHookCategory.get(hookCategoryName);
|
|
66
|
+
if (pluginsForCategory === undefined) {
|
|
67
|
+
pluginsForCategory = [];
|
|
68
|
+
this.#pluginsByHookCategory.set(hookCategoryName, pluginsForCategory);
|
|
69
|
+
}
|
|
70
|
+
pluginsForCategory.push(plugin);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
27
73
|
}
|
|
28
74
|
setContext(context) {
|
|
29
75
|
this.#context = context;
|
|
@@ -35,6 +81,7 @@ export class HookManagerImplementation {
|
|
|
35
81
|
this.#dynamicHookHandlerCategories.set(hookCategoryName, categories);
|
|
36
82
|
}
|
|
37
83
|
categories.unshift(hookHandlerCategory);
|
|
84
|
+
this.#invalidateResolvedHandlersCache(hookCategoryName);
|
|
38
85
|
}
|
|
39
86
|
unregisterHandlers(hookCategoryName, hookHandlerCategory) {
|
|
40
87
|
const categories = this.#dynamicHookHandlerCategories.get(hookCategoryName);
|
|
@@ -42,9 +89,21 @@ export class HookManagerImplementation {
|
|
|
42
89
|
return;
|
|
43
90
|
}
|
|
44
91
|
this.#dynamicHookHandlerCategories.set(hookCategoryName, categories.filter((c) => c !== hookHandlerCategory));
|
|
92
|
+
this.#invalidateResolvedHandlersCache(hookCategoryName);
|
|
45
93
|
}
|
|
46
94
|
async runHandlerChain(hookCategoryName, hookName, params, defaultImplementation) {
|
|
47
|
-
|
|
95
|
+
// Synchronous fast path for already cached handlers. This duplicates
|
|
96
|
+
// the check inside #getHandlersInChainedRunningOrder on purpose:
|
|
97
|
+
// calling that async method introduces a microtask tick even on a
|
|
98
|
+
// cache hit, whereas a direct Map lookup stays on the current tick.
|
|
99
|
+
// That tick matters here because runHandlerChain is on every hook's
|
|
100
|
+
// hot path, and this path pairs with the empty-handlers shortcut
|
|
101
|
+
// below to dispatch straight to defaultImplementation with no awaits.
|
|
102
|
+
const cachedHandlers = this.#chainedHandlers
|
|
103
|
+
.get(hookCategoryName)
|
|
104
|
+
?.get(hookName);
|
|
105
|
+
const handlers = cachedHandlers ??
|
|
106
|
+
(await this.#getHandlersInChainedRunningOrder(hookCategoryName, hookName));
|
|
48
107
|
let handlerParams;
|
|
49
108
|
if (hookCategoryName !== "config") {
|
|
50
109
|
assertHardhatInvariant(this.#context !== undefined, "Context must be set before running non-config hooks");
|
|
@@ -53,6 +112,12 @@ export class HookManagerImplementation {
|
|
|
53
112
|
else {
|
|
54
113
|
handlerParams = params;
|
|
55
114
|
}
|
|
115
|
+
// Fast path for the common case of no registered handlers: skip building
|
|
116
|
+
// handlerParams and the `next` closure, and call the default implementation
|
|
117
|
+
// directly.
|
|
118
|
+
if (handlers.length === 0) {
|
|
119
|
+
return (await defaultImplementation(...handlerParams));
|
|
120
|
+
}
|
|
56
121
|
const numberOfHandlers = handlers.length;
|
|
57
122
|
let index = 0;
|
|
58
123
|
const next = async (...nextParams) => {
|
|
@@ -98,65 +163,144 @@ export class HookManagerImplementation {
|
|
|
98
163
|
return handlers.length > 0;
|
|
99
164
|
}
|
|
100
165
|
async #getHandlersInChainedRunningOrder(hookCategoryName, hookName) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
166
|
+
let handlersByName = this.#chainedHandlers.get(hookCategoryName);
|
|
167
|
+
if (handlersByName === undefined) {
|
|
168
|
+
handlersByName = new Map();
|
|
169
|
+
this.#chainedHandlers.set(hookCategoryName, handlersByName);
|
|
170
|
+
}
|
|
171
|
+
const cached = handlersByName.get(hookName);
|
|
172
|
+
if (cached !== undefined) {
|
|
173
|
+
return cached;
|
|
174
|
+
}
|
|
175
|
+
const staticCategories = await this.#getStaticHookHandlerCategories(hookCategoryName);
|
|
176
|
+
// IMPORTANT NOTE: Accessing the dynamic hook handlers MUST happen
|
|
177
|
+
// after awaiting the static ones. See
|
|
178
|
+
// #invalidateResolvedHandlersCache for more info.
|
|
179
|
+
const dynamicCategories = this.#dynamicHookHandlerCategories.get(hookCategoryName);
|
|
180
|
+
const handlers = [];
|
|
181
|
+
if (dynamicCategories !== undefined) {
|
|
182
|
+
for (const category of dynamicCategories) {
|
|
183
|
+
const handler = category[hookName];
|
|
184
|
+
if (handler !== undefined) {
|
|
185
|
+
handlers.push(handler);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
for (const category of staticCategories) {
|
|
190
|
+
const handler = category[hookName];
|
|
191
|
+
if (handler !== undefined) {
|
|
192
|
+
handlers.push(handler);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
handlersByName.set(hookName, handlers);
|
|
196
|
+
return handlers;
|
|
104
197
|
}
|
|
105
198
|
async #getHandlersInSequentialRunningOrder(hookCategoryName, hookName) {
|
|
106
|
-
|
|
107
|
-
|
|
199
|
+
let handlersByName = this.#sequentialHandlers.get(hookCategoryName);
|
|
200
|
+
if (handlersByName === undefined) {
|
|
201
|
+
handlersByName = new Map();
|
|
202
|
+
this.#sequentialHandlers.set(hookCategoryName, handlersByName);
|
|
203
|
+
}
|
|
204
|
+
const cached = handlersByName.get(hookName);
|
|
205
|
+
if (cached !== undefined) {
|
|
206
|
+
return cached;
|
|
207
|
+
}
|
|
208
|
+
const chained = await this.#getHandlersInChainedRunningOrder(hookCategoryName, hookName);
|
|
209
|
+
const sequential = chained.toReversed();
|
|
210
|
+
handlersByName.set(hookName, sequential);
|
|
211
|
+
return sequential;
|
|
108
212
|
}
|
|
109
|
-
async #
|
|
110
|
-
const
|
|
111
|
-
if (
|
|
213
|
+
async #getStaticHookHandlerCategories(hookCategoryName) {
|
|
214
|
+
const cached = this.#resolvedStaticCategories.get(hookCategoryName);
|
|
215
|
+
if (cached !== undefined) {
|
|
216
|
+
return cached;
|
|
217
|
+
}
|
|
218
|
+
const plugins = this.#pluginsByHookCategory.get(hookCategoryName);
|
|
219
|
+
// We don't need to get the mutex to resolve this case, as it will always
|
|
220
|
+
// be an empty array, and won't execute any factory.
|
|
221
|
+
if (plugins === undefined) {
|
|
222
|
+
this.#resolvedStaticCategories.set(hookCategoryName, []);
|
|
112
223
|
return [];
|
|
113
224
|
}
|
|
114
|
-
return
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
const categories = await this.#mutex.exclusiveRun(async () => {
|
|
120
|
-
return await Promise.all(this.#pluginsInReverseOrder.map(async (plugin) => {
|
|
121
|
-
const existingCategory = this.#staticHookHandlerCategories
|
|
122
|
-
.get(plugin.id)
|
|
123
|
-
?.get(hookCategoryName);
|
|
124
|
-
if (existingCategory !== undefined) {
|
|
125
|
-
return existingCategory;
|
|
126
|
-
}
|
|
127
|
-
const hookHandlerCategoryFactory = plugin.hookHandlers?.[hookCategoryName];
|
|
128
|
-
if (hookHandlerCategoryFactory === undefined) {
|
|
129
|
-
return;
|
|
130
|
-
}
|
|
131
|
-
let factory;
|
|
132
|
-
try {
|
|
133
|
-
factory = (await hookHandlerCategoryFactory()).default;
|
|
134
|
-
}
|
|
135
|
-
catch (error) {
|
|
136
|
-
ensureError(error);
|
|
137
|
-
await detectPluginNpmDependencyProblems(this.#projectRoot, plugin, error);
|
|
138
|
-
throw error;
|
|
139
|
-
}
|
|
140
|
-
assertHardhatInvariant(typeof factory === "function", `Plugin ${plugin.id} doesn't export a hook factory for category ${hookCategoryName}`);
|
|
141
|
-
const hookCategory = await factory();
|
|
142
|
-
assertHardhatInvariant(hookCategory !== null && typeof hookCategory === "object", `Plugin ${plugin.id} doesn't export a valid factory for category ${hookCategoryName}, it didn't return an object`);
|
|
143
|
-
if (!this.#staticHookHandlerCategories.has(plugin.id)) {
|
|
144
|
-
this.#staticHookHandlerCategories.set(plugin.id, new Map());
|
|
145
|
-
}
|
|
146
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Defined right above
|
|
147
|
-
this.#staticHookHandlerCategories
|
|
148
|
-
.get(plugin.id)
|
|
149
|
-
.set(hookCategoryName, hookCategory);
|
|
150
|
-
return hookCategory;
|
|
151
|
-
}));
|
|
152
|
-
});
|
|
153
|
-
return categories.flatMap((category) => {
|
|
154
|
-
const handler = category?.[hookName];
|
|
155
|
-
if (handler === undefined) {
|
|
156
|
-
return [];
|
|
225
|
+
return await this.#mutex.exclusiveRun(async () => {
|
|
226
|
+
// Re-check under the mutex in case another caller just populated it.
|
|
227
|
+
const recheck = this.#resolvedStaticCategories.get(hookCategoryName);
|
|
228
|
+
if (recheck !== undefined) {
|
|
229
|
+
return recheck;
|
|
157
230
|
}
|
|
158
|
-
|
|
231
|
+
const resolved = await Promise.all(plugins.map(async (plugin) => await this.#getPluginStaticHookCategory(plugin, hookCategoryName)));
|
|
232
|
+
this.#resolvedStaticCategories.set(hookCategoryName, resolved);
|
|
233
|
+
return resolved;
|
|
159
234
|
});
|
|
160
235
|
}
|
|
236
|
+
/**
|
|
237
|
+
* Returns the hook category object for a plugin that has the hook category
|
|
238
|
+
* defined.
|
|
239
|
+
*
|
|
240
|
+
* @param plugin A plugin that MUST have the given hook category defined.
|
|
241
|
+
* @param hookCategoryName The name of the hook category.
|
|
242
|
+
* @returns The hook category object.
|
|
243
|
+
*/
|
|
244
|
+
async #getPluginStaticHookCategory(plugin, hookCategoryName) {
|
|
245
|
+
const hookHandlerCategoryFactory = plugin.hookHandlers?.[hookCategoryName];
|
|
246
|
+
assertHardhatInvariant(hookHandlerCategoryFactory !== undefined, "#pluginsByHookCategory only contains plugins with this hook category");
|
|
247
|
+
let factory;
|
|
248
|
+
try {
|
|
249
|
+
factory = (await hookHandlerCategoryFactory()).default;
|
|
250
|
+
}
|
|
251
|
+
catch (error) {
|
|
252
|
+
ensureError(error);
|
|
253
|
+
await detectPluginNpmDependencyProblems(this.#projectRoot, plugin, error);
|
|
254
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.HOOKS.FAILED_TO_LOAD_HOOK_HANDLER_FACTORY, { pluginId: plugin.id, hookCategoryName }, error);
|
|
255
|
+
}
|
|
256
|
+
assertHardhatInvariant(typeof factory === "function", `Plugin ${plugin.id} doesn't export a hook factory for category ${hookCategoryName}`);
|
|
257
|
+
let hookCategory;
|
|
258
|
+
try {
|
|
259
|
+
hookCategory = await factory();
|
|
260
|
+
}
|
|
261
|
+
catch (error) {
|
|
262
|
+
ensureError(error);
|
|
263
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.HOOKS.FAILED_TO_RUN_HOOK_HANDLER_FACTORY, { pluginId: plugin.id, hookCategoryName }, error);
|
|
264
|
+
}
|
|
265
|
+
assertHardhatInvariant(hookCategory !== null && typeof hookCategory === "object", `Plugin ${plugin.id} doesn't export a valid factory for category ${hookCategoryName}, it didn't return an object`);
|
|
266
|
+
return hookCategory;
|
|
267
|
+
}
|
|
268
|
+
#invalidateResolvedHandlersCache(hookCategoryName) {
|
|
269
|
+
// Invalidation deletes the outer entry rather than clearing the inner
|
|
270
|
+
// map. This matters under concurrency.
|
|
271
|
+
//
|
|
272
|
+
// A reader of #getHandlersInChainedRunningOrder (or its sequential
|
|
273
|
+
// sibling) captures a reference to the inner map before awaiting the
|
|
274
|
+
// static categories, and writes its computed array back after the
|
|
275
|
+
// await. If invalidation runs during that await, deleting the outer
|
|
276
|
+
// entry leaves the reader's inner map orphaned: its write lands in a
|
|
277
|
+
// map no longer reachable from #chainedHandlers/#sequentialHandlers,
|
|
278
|
+
// so it cannot poison the shared cache. The next reader sees
|
|
279
|
+
// `undefined`, installs a fresh inner map, and rebuilds from the
|
|
280
|
+
// current dynamic state.
|
|
281
|
+
//
|
|
282
|
+
// Two distinct properties make this safe, guaranteed by two different
|
|
283
|
+
// things:
|
|
284
|
+
//
|
|
285
|
+
// 1. The in-flight reader's own return value is correct. This is
|
|
286
|
+
// because #getHandlersInChainedRunningOrder reads
|
|
287
|
+
// #dynamicHookHandlerCategories *after* awaiting the static
|
|
288
|
+
// categories. Any invalidation that happened during the await is
|
|
289
|
+
// visible to the reader when it resumes, so the array it builds
|
|
290
|
+
// reflects the current dynamic state.
|
|
291
|
+
//
|
|
292
|
+
// 2. The shared cache never holds a stale array. This is guaranteed
|
|
293
|
+
// by the orphaning-by-delete described above: a reader that
|
|
294
|
+
// started before the invalidation can only write into an
|
|
295
|
+
// unreachable inner map.
|
|
296
|
+
//
|
|
297
|
+
// Property 1 depends on the ordering of the dynamic handlers read relative
|
|
298
|
+
// to the await. If that read ever moved *before* the await, a reader
|
|
299
|
+
// could build a stale array and return it to its caller — the cache
|
|
300
|
+
// would still be protected by property 2, but the reader's caller
|
|
301
|
+
// would see the stale result.
|
|
302
|
+
this.#chainedHandlers.delete(hookCategoryName);
|
|
303
|
+
this.#sequentialHandlers.delete(hookCategoryName);
|
|
304
|
+
}
|
|
161
305
|
}
|
|
162
306
|
//# sourceMappingURL=hook-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-manager.js","sourceRoot":"","sources":["../../../../src/internal/core/hook-manager.ts"],"names":[],"mappings":"AAcA,OAAO,
|
|
1
|
+
{"version":3,"file":"hook-manager.js","sourceRoot":"","sources":["../../../../src/internal/core/hook-manager.ts"],"names":[],"mappings":"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"}
|