hardhat 3.1.10 → 3.1.12
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 +26 -0
- package/dist/src/internal/builtin-plugins/artifacts/artifact-manager.d.ts +2 -2
- package/dist/src/internal/builtin-plugins/artifacts/artifact-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/artifacts/artifact-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/artifacts/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/artifacts/hook-handlers/hre.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers.d.ts +3 -5
- package/dist/src/internal/builtin-plugins/coverage/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers.js +7 -19
- package/dist/src/internal/builtin-plugins/coverage/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.d.ts +7 -0
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.js +42 -0
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.js.map +1 -0
- package/dist/src/internal/builtin-plugins/coverage/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/index.js +1 -0
- package/dist/src/internal/builtin-plugins/coverage/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.d.ts +53 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.js +288 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.js.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.d.ts +0 -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 +2 -14
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.d.ts +8 -5
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.js +20 -18
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.d.ts +7 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.js +42 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.js.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/index.js +36 -2
- package/dist/src/internal/builtin-plugins/gas-analytics/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts +45 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js +276 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts +22 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js +88 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js.map +1 -0
- package/dist/src/internal/builtin-plugins/index.js +1 -1
- 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 +17 -20
- package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-generation-errors.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-generation-errors.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-generation-errors.js +2 -2
- package/dist/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-generation-errors.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/type-validation.d.ts +0 -2
- package/dist/src/internal/builtin-plugins/network-manager/edr/type-validation.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/type-validation.js +0 -6
- package/dist/src/internal/builtin-plugins/network-manager/edr/type-validation.js.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.d.ts +1 -3
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js +0 -49
- package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-results.d.ts +2 -2
- package/dist/src/internal/builtin-plugins/solidity/build-results.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-results.js +2 -2
- package/dist/src/internal/builtin-plugins/solidity/build-results.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.d.ts +1 -0
- 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 +13 -5
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.js +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/dependency-graph.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/dependency-graph.js +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.d.ts +2 -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/remapped-npm-packages-graph.d.ts +13 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.js +30 -5
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/types.d.ts +3 -12
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/types.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/types.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/utils.d.ts +1 -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/solc-config-selection.d.ts +8 -6
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-config-selection.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-config-selection.js +103 -27
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-config-selection.js.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/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.js +5 -0
- package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/tasks/build.js +1 -1
- package/dist/src/internal/builtin-plugins/solidity/tasks/build.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts +3 -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 +9 -0
- package/dist/src/internal/builtin-plugins/solidity-test/config.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.js +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.js +4 -10
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.js +0 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/runner.d.ts +2 -2
- package/dist/src/internal/builtin-plugins/solidity-test/runner.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/runner.js +3 -3
- package/dist/src/internal/builtin-plugins/solidity-test/runner.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts +5 -0
- 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 +21 -27
- 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 +15 -10
- package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/telemetry/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/telemetry/task-action.js +3 -2
- package/dist/src/internal/builtin-plugins/telemetry/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.js +62 -13
- package/dist/src/internal/builtin-plugins/test/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/test/type-extensions.d.ts +27 -0
- package/dist/src/internal/builtin-plugins/test/type-extensions.d.ts.map +1 -1
- package/dist/src/internal/cli/banner-manager.d.ts +26 -0
- package/dist/src/internal/cli/banner-manager.d.ts.map +1 -0
- package/dist/src/internal/cli/banner-manager.js +146 -0
- package/dist/src/internal/cli/banner-manager.js.map +1 -0
- package/dist/src/internal/cli/init/init.d.ts.map +1 -1
- package/dist/src/internal/cli/init/init.js +8 -0
- package/dist/src/internal/cli/init/init.js.map +1 -1
- package/dist/src/internal/cli/main.d.ts.map +1 -1
- package/dist/src/internal/cli/main.js +18 -1
- package/dist/src/internal/cli/main.js.map +1 -1
- package/dist/src/internal/cli/telemetry/analytics/subprocess.js +2 -0
- package/dist/src/internal/cli/telemetry/analytics/subprocess.js.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/anonymize-paths.js +1 -1
- package/dist/src/internal/cli/telemetry/sentry/vendor/integrations/contextlines.d.ts +1 -1
- package/dist/src/internal/cli/telemetry/sentry/vendor/integrations/contextlines.d.ts.map +1 -1
- package/dist/src/internal/cli/telemetry/sentry/vendor/integrations/contextlines.js +47 -38
- package/dist/src/internal/cli/telemetry/sentry/vendor/integrations/contextlines.js.map +1 -1
- package/dist/src/internal/core/user-interruptions.js +1 -1
- package/dist/src/types/artifacts.d.ts +32 -3
- package/dist/src/types/artifacts.d.ts.map +1 -1
- package/dist/src/types/network.d.ts +1 -1
- package/dist/src/types/solidity/build-system.d.ts +56 -10
- package/dist/src/types/solidity/build-system.d.ts.map +1 -1
- package/dist/src/types/solidity/build-system.js +26 -2
- package/dist/src/types/solidity/build-system.js.map +1 -1
- package/dist/src/types/solidity/resolved-file.d.ts +2 -2
- package/dist/src/types/tasks.d.ts +8 -0
- package/dist/src/types/tasks.d.ts.map +1 -1
- package/dist/src/types/tasks.js.map +1 -1
- package/dist/src/types/test.d.ts +18 -0
- package/dist/src/types/test.d.ts.map +1 -1
- package/dist/src/types/utils.d.ts +16 -0
- package/dist/src/types/utils.d.ts.map +1 -1
- package/dist/src/utils/result.d.ts +33 -0
- package/dist/src/utils/result.d.ts.map +1 -0
- package/dist/src/utils/result.js +43 -0
- package/dist/src/utils/result.js.map +1 -0
- package/package.json +6 -5
- package/src/internal/builtin-plugins/artifacts/artifact-manager.ts +4 -1
- package/src/internal/builtin-plugins/artifacts/hook-handlers/hre.ts +4 -1
- package/src/internal/builtin-plugins/coverage/helpers.ts +11 -29
- package/src/internal/builtin-plugins/coverage/hook-handlers/test.ts +68 -0
- package/src/internal/builtin-plugins/coverage/index.ts +1 -0
- package/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.ts +473 -0
- package/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.ts +3 -17
- package/src/internal/builtin-plugins/gas-analytics/helpers.ts +38 -27
- package/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.ts +68 -0
- package/src/internal/builtin-plugins/gas-analytics/index.ts +37 -2
- package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts +454 -0
- package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts +172 -0
- package/src/internal/builtin-plugins/index.ts +1 -1
- package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts +21 -28
- package/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-generation-errors.ts +5 -2
- package/src/internal/builtin-plugins/network-manager/edr/type-validation.ts +0 -13
- package/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts +0 -64
- package/src/internal/builtin-plugins/solidity/build-results.ts +3 -1
- package/src/internal/builtin-plugins/solidity/build-system/build-system.ts +15 -5
- package/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.ts +1 -1
- package/src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts +1 -1
- package/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.ts +1 -1
- package/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.ts +36 -6
- package/src/internal/builtin-plugins/solidity/build-system/resolver/types.ts +3 -9
- package/src/internal/builtin-plugins/solidity/build-system/resolver/utils.ts +1 -1
- package/src/internal/builtin-plugins/solidity/build-system/solc-config-selection.ts +125 -28
- package/src/internal/builtin-plugins/solidity/config.ts +2 -2
- package/src/internal/builtin-plugins/solidity/hook-handlers/hre.ts +8 -0
- package/src/internal/builtin-plugins/solidity/tasks/build.ts +1 -1
- package/src/internal/builtin-plugins/solidity-test/config.ts +15 -0
- package/src/internal/builtin-plugins/solidity-test/edr-artifacts.ts +2 -2
- package/src/internal/builtin-plugins/solidity-test/helpers.ts +6 -14
- package/src/internal/builtin-plugins/solidity-test/index.ts +0 -1
- package/src/internal/builtin-plugins/solidity-test/runner.ts +3 -3
- package/src/internal/builtin-plugins/solidity-test/task-action.ts +47 -40
- package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +17 -10
- package/src/internal/builtin-plugins/telemetry/task-action.ts +4 -2
- package/src/internal/builtin-plugins/test/task-action.ts +88 -24
- package/src/internal/builtin-plugins/test/type-extensions.ts +42 -0
- package/src/internal/cli/banner-manager.ts +234 -0
- package/src/internal/cli/init/init.ts +8 -0
- package/src/internal/cli/main.ts +19 -1
- package/src/internal/cli/telemetry/analytics/subprocess.ts +2 -0
- package/src/internal/cli/telemetry/sentry/anonymize-paths.ts +1 -1
- package/src/internal/cli/telemetry/sentry/vendor/integrations/contextlines.ts +98 -50
- package/src/internal/core/user-interruptions.ts +1 -1
- package/src/types/artifacts.ts +40 -3
- package/src/types/hre.ts +1 -1
- package/src/types/network.ts +1 -1
- package/src/types/solidity/build-system.ts +75 -14
- package/src/types/solidity/resolved-file.ts +2 -2
- package/src/types/tasks.ts +10 -0
- package/src/types/test.ts +20 -0
- package/src/types/utils.ts +14 -0
- package/src/utils/result.ts +57 -0
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +9 -9
- package/templates/hardhat-3/02-mocha-ethers/package.json +10 -10
- package/templates/hardhat-3/03-minimal/package.json +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/output.d.ts +0 -19
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/output.d.ts.map +0 -1
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/output.js +0 -2
- package/dist/src/internal/builtin-plugins/network-manager/edr/types/output.js.map +0 -1
- package/src/internal/builtin-plugins/network-manager/edr/types/output.ts +0 -19
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { EdrNetworkAccountConfig, EdrNetworkAccountsConfig, ChainDescriptorsConfig, EdrNetworkForkingConfig, EdrNetworkMempoolConfig, EdrNetworkMiningConfig } from "../../../../../types/config.js";
|
|
2
2
|
import type { ChainType } from "../../../../../types/network.js";
|
|
3
3
|
import type { GasMeasurement } from "../../../gas-analytics/types.js";
|
|
4
|
-
import type {
|
|
5
|
-
import type { IntervalRange, DebugTraceResult, ChainOverride, ForkConfig, GasReport } from "@nomicfoundation/edr";
|
|
4
|
+
import type { IntervalRange, ChainOverride, ForkConfig, GasReport } from "@nomicfoundation/edr";
|
|
6
5
|
import { MineOrdering, OpHardfork, SpecId } from "@nomicfoundation/edr";
|
|
7
6
|
import { L1HardforkName, OpHardforkName } from "../types/hardfork.js";
|
|
8
7
|
export declare function edrL1HardforkToHardhatL1HardforkName(hardfork: SpecId): L1HardforkName;
|
|
@@ -10,7 +9,6 @@ export declare function edrOpHardforkToHardhatOpHardforkName(hardfork: OpHardfor
|
|
|
10
9
|
export declare function hardhatHardforkToEdrSpecId(hardfork: string, chainType: ChainType): string;
|
|
11
10
|
export declare function hardhatMiningIntervalToEdrMiningInterval(config: EdrNetworkMiningConfig["interval"]): bigint | IntervalRange | undefined;
|
|
12
11
|
export declare function hardhatMempoolOrderToEdrMineOrdering(mempoolOrder: EdrNetworkMempoolConfig["order"]): MineOrdering;
|
|
13
|
-
export declare function edrRpcDebugTraceToHardhat(debugTraceResult: DebugTraceResult): RpcDebugTraceOutput;
|
|
14
12
|
export declare function hardhatAccountsToEdrOwnedAccounts(accounts: EdrNetworkAccountsConfig): Promise<Array<{
|
|
15
13
|
secretKey: string;
|
|
16
14
|
balance: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-to-edr.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"convert-to-edr.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,UAAU,EACV,SAAS,EACV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,YAAY,EACZ,UAAU,EACV,MAAM,EA4BP,MAAM,sBAAsB,CAAC;AAc9B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItE,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,GACf,cAAc,CAkDhB;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,UAAU,GACnB,cAAc,CA0BhB;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,GACnB,MAAM,CAIR;AAqFD,wBAAgB,wCAAwC,CACtD,MAAM,EAAE,sBAAsB,CAAC,UAAU,CAAC,GACzC,MAAM,GAAG,aAAa,GAAG,SAAS,CAcpC;AAED,wBAAgB,oCAAoC,CAClD,YAAY,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAC7C,YAAY,CAOd;AAED,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,KAAK,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CASxD;AAED,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAoBpC;AAED,wBAAgB,0CAA0C,CACxD,gBAAgB,EAAE,sBAAsB,EACxC,SAAS,EAAE,SAAS,GACnB,aAAa,EAAE,CAuCjB;AAED,wBAAsB,mCAAmC,CACvD,aAAa,EAAE,uBAAuB,GAAG,SAAS,EAClD,gBAAgB,EAAE,sBAAsB,EACxC,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAwBjC;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,SAAS,EAAE,SAAS,EACpB,oBAAoB,GAAE,MAAM,EAAO,GAClC,cAAc,EAAE,CAoClB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { GasReportExecutionStatus, MineOrdering, OpHardfork, SpecId, FRONTIER, HOMESTEAD, DAO_FORK, TANGERINE, SPURIOUS_DRAGON, BYZANTIUM, CONSTANTINOPLE, PETERSBURG, ISTANBUL, MUIR_GLACIER, BERLIN, LONDON, ARROW_GLACIER, GRAY_GLACIER, MERGE, SHANGHAI, CANCUN, PRAGUE, OSAKA, BEDROCK, REGOLITH, CANYON, ECOTONE, FJORD, GRANITE, HOLOCENE, ISTHMUS, } from "@nomicfoundation/edr";
|
|
2
|
-
import { getUnprefixedHexString } from "@nomicfoundation/hardhat-utils/hex";
|
|
3
2
|
import { GENERIC_CHAIN_TYPE, L1_CHAIN_TYPE, OPTIMISM_CHAIN_TYPE, } from "../../../../constants.js";
|
|
4
3
|
import { FixedValueConfigurationVariable } from "../../../../core/configuration-variables.js";
|
|
5
4
|
import { derivePrivateKeys } from "../../accounts/derive-private-keys.js";
|
|
@@ -188,54 +187,6 @@ export function hardhatMempoolOrderToEdrMineOrdering(mempoolOrder) {
|
|
|
188
187
|
return MineOrdering.Priority;
|
|
189
188
|
}
|
|
190
189
|
}
|
|
191
|
-
// TODO: EDR should handle this conversion. This is a temporary solution.
|
|
192
|
-
export function edrRpcDebugTraceToHardhat(debugTraceResult) {
|
|
193
|
-
const structLogs = debugTraceResult.structLogs.map((log) => {
|
|
194
|
-
const result = {
|
|
195
|
-
depth: Number(log.depth),
|
|
196
|
-
gas: Number(log.gas),
|
|
197
|
-
gasCost: Number(log.gasCost),
|
|
198
|
-
op: log.opName,
|
|
199
|
-
pc: Number(log.pc),
|
|
200
|
-
};
|
|
201
|
-
if (log.memory !== undefined) {
|
|
202
|
-
result.memory = log.memory;
|
|
203
|
-
}
|
|
204
|
-
if (log.stack !== undefined) {
|
|
205
|
-
// Remove 0x prefix which is required by EIP-3155, but not expected by Hardhat.
|
|
206
|
-
result.stack = log.stack.map(getUnprefixedHexString);
|
|
207
|
-
}
|
|
208
|
-
if (log.storage !== undefined) {
|
|
209
|
-
result.storage = Object.fromEntries(Object.entries(log.storage).map(([key, value]) => [
|
|
210
|
-
getUnprefixedHexString(key),
|
|
211
|
-
getUnprefixedHexString(value),
|
|
212
|
-
]));
|
|
213
|
-
}
|
|
214
|
-
if (log.error !== undefined) {
|
|
215
|
-
result.error = {
|
|
216
|
-
message: log.error,
|
|
217
|
-
};
|
|
218
|
-
}
|
|
219
|
-
return result;
|
|
220
|
-
});
|
|
221
|
-
// REVM trace adds initial STOP that Hardhat doesn't expect
|
|
222
|
-
// TODO: double check with EDR team that this is still the case
|
|
223
|
-
if (structLogs.length > 0 && structLogs[0].op === "STOP") {
|
|
224
|
-
structLogs.shift();
|
|
225
|
-
}
|
|
226
|
-
/* eslint-disable-next-line @typescript-eslint/consistent-type-assertions --
|
|
227
|
-
debugTraceResult.output is a string, but it's typed as Buffer in Edr */
|
|
228
|
-
let returnValue = debugTraceResult.output ?? "0x";
|
|
229
|
-
if (returnValue === "0x") {
|
|
230
|
-
returnValue = "";
|
|
231
|
-
}
|
|
232
|
-
return {
|
|
233
|
-
failed: !debugTraceResult.pass,
|
|
234
|
-
gas: Number(debugTraceResult.gasUsed),
|
|
235
|
-
returnValue,
|
|
236
|
-
structLogs,
|
|
237
|
-
};
|
|
238
|
-
}
|
|
239
190
|
export async function hardhatAccountsToEdrOwnedAccounts(accounts) {
|
|
240
191
|
const normalizedAccounts = await normalizeEdrNetworkAccountsConfig(accounts);
|
|
241
192
|
const accountPromises = normalizedAccounts.map(async (account) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-to-edr.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"convert-to-edr.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CompilationJobCreationError, FailedFileBuildResult, FileBuildResult } from "../../../types/solidity.js";
|
|
1
|
+
import type { CompilationJobCreationError, FailedFileBuildResult, FileBuildResult, SolidityBuildSystem } from "../../../types/solidity.js";
|
|
2
2
|
type SolidityBuildResults = Map<string, FileBuildResult> | CompilationJobCreationError;
|
|
3
3
|
type SuccessfulSolidityBuildResults = Map<string, Exclude<FileBuildResult, FailedFileBuildResult>>;
|
|
4
4
|
/**
|
|
@@ -6,6 +6,6 @@ type SuccessfulSolidityBuildResults = Map<string, Exclude<FileBuildResult, Faile
|
|
|
6
6
|
* It throws a HardhatError if the build results indicate that the compilation
|
|
7
7
|
* job failed.
|
|
8
8
|
*/
|
|
9
|
-
export declare function throwIfSolidityBuildFailed(results: SolidityBuildResults): asserts results is SuccessfulSolidityBuildResults;
|
|
9
|
+
export declare function throwIfSolidityBuildFailed(solidity: SolidityBuildSystem, results: SolidityBuildResults): asserts results is SuccessfulSolidityBuildResults;
|
|
10
10
|
export {};
|
|
11
11
|
//# sourceMappingURL=build-results.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-results.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/build-results.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,qBAAqB,EACrB,eAAe,
|
|
1
|
+
{"version":3,"file":"build-results.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/build-results.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAMpC,KAAK,oBAAoB,GACrB,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAC5B,2BAA2B,CAAC;AAChC,KAAK,8BAA8B,GAAG,GAAG,CACvC,MAAM,EACN,OAAO,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAChD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,mBAAmB,EAC7B,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,OAAO,IAAI,8BAA8B,CAqBnD"}
|
|
@@ -5,8 +5,8 @@ import { FileBuildResultType } from "../../../types/solidity.js";
|
|
|
5
5
|
* It throws a HardhatError if the build results indicate that the compilation
|
|
6
6
|
* job failed.
|
|
7
7
|
*/
|
|
8
|
-
export function throwIfSolidityBuildFailed(results) {
|
|
9
|
-
if (
|
|
8
|
+
export function throwIfSolidityBuildFailed(solidity, results) {
|
|
9
|
+
if (!solidity.isSuccessfulBuildResult(results)) {
|
|
10
10
|
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY.COMPILATION_JOB_CREATION_ERROR, {
|
|
11
11
|
reason: results.formattedReason,
|
|
12
12
|
rootFilePath: results.rootFilePath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-results.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/build-results.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build-results.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/build-results.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAUjE;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CACxC,QAA6B,EAC7B,OAA6B;IAE7B,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,8BAA8B,EAChE;YACE,MAAM,EAAE,OAAO,CAAC,eAAe;YAC/B,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAC5C,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACX,IAAI,KAAK,mBAAmB,CAAC,SAAS;QACtC,IAAI,KAAK,mBAAmB,CAAC,aAAa,CAC7C,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzE,CAAC;AACH,CAAC"}
|
|
@@ -21,6 +21,7 @@ export declare class SolidityBuildSystemImplementation implements SolidityBuildS
|
|
|
21
21
|
getRootFilePaths(options?: {
|
|
22
22
|
scope?: BuildScope;
|
|
23
23
|
}): Promise<string[]>;
|
|
24
|
+
isSuccessfulBuildResult(buildResult: CompilationJobCreationError | Map<string, FileBuildResult>): buildResult is Map<string, FileBuildResult>;
|
|
24
25
|
build(rootFilePaths: string[], _options?: BuildOptions): Promise<CompilationJobCreationError | Map<string, FileBuildResult>>;
|
|
25
26
|
getCompilationJobs(rootFilePaths: string[], options?: GetCompilationJobsOptions): Promise<CompilationJobCreationError | GetCompilationJobsResult>;
|
|
26
27
|
runCompilationJob(runnableCompilationJob: CompilationJob, options?: RunCompilationJobOptions): Promise<RunCompilationJobResult>;
|
|
@@ -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,EAAc,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC9E,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,EACV,cAAc,EAEd,cAAc,EACd,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAqEvC,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAMA,CAAC;AAQF,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACpC;AAoBD,qBAAa,iCAAkC,YAAW,mBAAmB;;gBAM/D,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,0BAA0B;IAKtD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiB7C,gBAAgB,CAC3B,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,MAAM,EAAE,CAAC;
|
|
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,EAAc,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC9E,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,EACV,cAAc,EAEd,cAAc,EACd,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAqEvC,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAMA,CAAC;AAQF,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACpC;AAoBD,qBAAa,iCAAkC,YAAW,mBAAmB;;gBAM/D,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,0BAA0B;IAKtD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiB7C,gBAAgB,CAC3B,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,MAAM,EAAE,CAAC;IAyCb,uBAAuB,CAC5B,WAAW,EAAE,2BAA2B,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GACtE,WAAW,IAAI,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;IAIjC,KAAK,CAChB,aAAa,EAAE,MAAM,EAAE,EACvB,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC,2BAA2B,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAqMzD,kBAAkB,CAC7B,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC,2BAA2B,GAAG,wBAAwB,CAAC;IAoPrD,iBAAiB,CAC5B,sBAAsB,EAAE,cAAc,EACtC,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,uBAAuB,CAAC;IA+CtB,kBAAkB,CAC7B,sBAAsB,EAAE,cAAc,EACtC,KAAK,EAAE,mBAAmB,EAC1B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,mBAAmB,CAAC;IA6BlB,aAAa,CACxB,sBAAsB,EAAE,cAAc,EACtC,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,mBAAmB,CAAC;IAoJlB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAMzD,gBAAgB,CAC3B,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,IAAI,CAAC;IAyGH,gBAAgB,CAC3B,SAAS,EAAE,iBAAiB,EAC5B,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,cAAc,CAAC;CAmP3B"}
|
|
@@ -91,6 +91,9 @@ export class SolidityBuildSystemImplementation {
|
|
|
91
91
|
return rootFilePaths;
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
+
isSuccessfulBuildResult(buildResult) {
|
|
95
|
+
return buildResult instanceof Map;
|
|
96
|
+
}
|
|
94
97
|
async build(rootFilePaths, _options) {
|
|
95
98
|
return this.#hooks.runHandlerChain("solidity", "build", [rootFilePaths, _options], async (_context, nextRootFilePaths, nextOptions) => this.#build(nextRootFilePaths, nextOptions));
|
|
96
99
|
}
|
|
@@ -107,7 +110,7 @@ export class SolidityBuildSystemImplementation {
|
|
|
107
110
|
await this.#downloadConfiguredCompilers(options.quiet);
|
|
108
111
|
const { buildProfile } = this.#getBuildProfile(options.buildProfile);
|
|
109
112
|
const compilationJobsResult = await this.getCompilationJobs(rootFilePaths, options);
|
|
110
|
-
if (
|
|
113
|
+
if (!compilationJobsResult.success) {
|
|
111
114
|
return compilationJobsResult;
|
|
112
115
|
}
|
|
113
116
|
const spinner = createSpinner({
|
|
@@ -204,16 +207,16 @@ export class SolidityBuildSystemImplementation {
|
|
|
204
207
|
this.#options.projectRoot, readSourceFileFactory(this.#hooks), this.#hooks);
|
|
205
208
|
const { buildProfileName, buildProfile } = this.#getBuildProfile(options?.buildProfile);
|
|
206
209
|
log(`Using build profile ${buildProfileName}`);
|
|
207
|
-
const solcConfigSelector = new SolcConfigSelector(buildProfileName, buildProfile
|
|
210
|
+
const solcConfigSelector = new SolcConfigSelector(buildProfileName, buildProfile);
|
|
208
211
|
let subgraphsWithConfig = [];
|
|
209
212
|
for (const [rootFile, resolvedFile] of dependencyGraph.getRoots()) {
|
|
210
213
|
log(`Building compilation job for root file ${rootFile} with input source name ${resolvedFile.inputSourceName} and user source name ${rootFile}`);
|
|
211
214
|
const subgraph = dependencyGraph.getSubgraph(rootFile);
|
|
212
215
|
const configOrError = solcConfigSelector.selectBestSolcConfigForSingleRootGraph(subgraph);
|
|
213
|
-
if (
|
|
216
|
+
if (!configOrError.success) {
|
|
214
217
|
return configOrError;
|
|
215
218
|
}
|
|
216
|
-
subgraphsWithConfig.push([configOrError, subgraph]);
|
|
219
|
+
subgraphsWithConfig.push([configOrError.config, subgraph]);
|
|
217
220
|
}
|
|
218
221
|
// get longVersion and isWasm from the compiler for each version
|
|
219
222
|
const solcVersionToLongVersion = new Map();
|
|
@@ -326,7 +329,12 @@ export class SolidityBuildSystemImplementation {
|
|
|
326
329
|
compilationJobsPerFile.set(formatRootPath(userSourceName, root), runnableCompilationJob);
|
|
327
330
|
}
|
|
328
331
|
}
|
|
329
|
-
return {
|
|
332
|
+
return {
|
|
333
|
+
success: true,
|
|
334
|
+
compilationJobsPerFile,
|
|
335
|
+
indexedIndividualJobs,
|
|
336
|
+
cacheHits,
|
|
337
|
+
};
|
|
330
338
|
}
|
|
331
339
|
#getBuildProfile(buildProfileName = DEFAULT_BUILD_PROFILE) {
|
|
332
340
|
const buildProfile = this.#options.solidityConfig.profiles[buildProfileName];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-system.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build-system.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ async function spawnCompile(command, args, input) {
|
|
|
37
37
|
assertHardhatInvariant(subprocess.stdout !== null, "process.stdout is null");
|
|
38
38
|
assertHardhatInvariant(subprocess.stderr !== null, "process.stderr is null");
|
|
39
39
|
const stdoutPipeline = subprocess.stdout.pipe(stdoutWriteStream);
|
|
40
|
-
// NOTE: Compiler warnings are NOT written to
|
|
40
|
+
// NOTE: Compiler warnings are NOT written to stderr, they are returned via
|
|
41
41
|
// the `errors` field of the CompilerOutput instead
|
|
42
42
|
const stderrPipeline = subprocess.stderr.pipe(createNonClosingWriter(process.stderr));
|
|
43
43
|
subprocess.on("close", async (code) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/compiler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD,OAAO,EACL,YAAY,EACZ,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,MAAM,GACP,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,YAAY,CACzB,OAAe,EACf,IAAc,EACd,KAAoB;IAEpB,sEAAsE;IACtE,mEAAmE;IACnE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,CAAC;IAEjD,IAAI,CAAC;QACH,OAAO,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACtD,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;YAE/D,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAExC,sBAAsB,CACpB,UAAU,CAAC,MAAM,KAAK,IAAI,EAC1B,wBAAwB,CACzB,CAAC;YACF,sBAAsB,CACpB,UAAU,CAAC,MAAM,KAAK,IAAI,EAC1B,wBAAwB,CACzB,CAAC;YAEF,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACjE,
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/compiler/compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare class DependencyGraphImplementation implements DependencyGraph {
|
|
|
9
9
|
#private;
|
|
10
10
|
/**
|
|
11
11
|
* Adds a root file to the graph. All the roots of the dependency graph must
|
|
12
|
-
* be added before any
|
|
12
|
+
* be added before any dependency.
|
|
13
13
|
*
|
|
14
14
|
* @param userSourceName The source name used to identify the file, as it
|
|
15
15
|
* would appear in the artifacts and used by the user. This is not always the
|
|
@@ -5,7 +5,7 @@ export class DependencyGraphImplementation {
|
|
|
5
5
|
#dependenciesMap = new Map();
|
|
6
6
|
/**
|
|
7
7
|
* Adds a root file to the graph. All the roots of the dependency graph must
|
|
8
|
-
* be added before any
|
|
8
|
+
* be added before any dependency.
|
|
9
9
|
*
|
|
10
10
|
* @param userSourceName The source name used to identify the file, as it
|
|
11
11
|
* would appear in the artifacts and used by the user. This is not always the
|
package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { Resolver, RemappedNpmPackagesGraphJson, Remapping, ResolvedNpmUserRemapping, ResolvedUserRemapping
|
|
1
|
+
import type { Resolver, RemappedNpmPackagesGraphJson, Remapping, ResolvedNpmUserRemapping, ResolvedUserRemapping } from "./types.js";
|
|
2
2
|
import type { ImportResolutionError, NpmRootResolutionError, ProjectRootResolutionError } from "../../../../../types/solidity/errors.js";
|
|
3
3
|
import type { ResolvedFile, ProjectResolvedFile, NpmPackageResolvedFile } from "../../../../../types/solidity/resolved-file.js";
|
|
4
|
+
import type { Result } from "../../../../../types/utils.js";
|
|
4
5
|
import { type RemappingsReaderFunction } from "./remapped-npm-packages-graph.js";
|
|
5
6
|
export declare class ResolverImplementation implements Resolver {
|
|
6
7
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,4BAA4B,EAC5B,SAAS,EACT,wBAAwB,EACxB,qBAAqB,
|
|
1
|
+
{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,4BAA4B,EAC5B,SAAS,EACT,wBAAwB,EACxB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACtB,0BAA0B,EAG3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAEV,YAAY,EAEZ,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,gDAAgD,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAgB5D,OAAO,EAGL,KAAK,wBAAwB,EAC9B,MAAM,kCAAkC,CAAC;AAgB1C,qBAAa,sBAAuB,YAAW,QAAQ;;IA2BrD;;;;;;;OAOG;WACiB,MAAM,CACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAClD,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,QAAQ,CAAC;IASpB,OAAO;IA2BM,kBAAkB,CAC7B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;IAMtD,8BAA8B,CACzC,SAAS,EAAE,MAAM,GAChB,OAAO,CACR,MAAM,CACJ;QAAE,IAAI,EAAE,sBAAsB,CAAC;QAAC,SAAS,CAAC,EAAE,wBAAwB,CAAA;KAAE,EACtE,sBAAsB,CACvB,CACF;IAMY,aAAa,CACxB,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CACR,MAAM,CACJ;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,SAAS,CAAC,EAAE,SAAS,GAAG,qBAAqB,CAAA;KAAE,EACrE,qBAAqB,CACtB,CACF;IAgIM,MAAM,IAAI;QACf,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACvD,wBAAwB,EAAE,4BAA4B,CAAC;KACxD;CAy2BF"}
|
|
@@ -1,5 +1,17 @@
|
|
|
1
|
-
import type { InstallationName, RemappedNpmPackagesGraph, Remapping, ResolvedUserRemapping, RemappedNpmPackagesGraphJson
|
|
1
|
+
import type { InstallationName, RemappedNpmPackagesGraph, Remapping, ResolvedUserRemapping, RemappedNpmPackagesGraphJson } from "./types.js";
|
|
2
2
|
import type { ResolvedFile, ResolvedNpmPackage, UserRemappingError } from "../../../../../types/solidity.js";
|
|
3
|
+
import type { Result } from "../../../../../types/utils.js";
|
|
4
|
+
/**
|
|
5
|
+
* Returns a normalized version of the path if it refers to a node_modules in
|
|
6
|
+
* the root directory (i.e. node_modules/...), or a `node_modules` directory
|
|
7
|
+
* in a parent directory (i.e. ../../node_modules/...).
|
|
8
|
+
*
|
|
9
|
+
* Otherwise returns `undefined`.
|
|
10
|
+
*
|
|
11
|
+
* @param pathToNormalize The path to normalize.
|
|
12
|
+
* @returns The normalized path (node_modules/...), or `undefined`.
|
|
13
|
+
*/
|
|
14
|
+
export declare function getNormalizeNodeModulesPath(pathToNormalize: string): string | undefined;
|
|
3
15
|
export type RemappingsReaderFunction = (packageName: string, packageVersion: string, packagePath: string, defaultBehavior: (name: string, version: string, path: string) => Promise<Array<{
|
|
4
16
|
remappings: string[];
|
|
5
17
|
source: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remapped-npm-packages-graph.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,gBAAgB,EAChB,wBAAwB,EACxB,SAAS,EACT,qBAAqB,EAErB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"remapped-npm-packages-graph.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,gBAAgB,EAChB,wBAAwB,EACxB,SAAS,EACT,qBAAqB,EAErB,4BAA4B,EAC7B,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAwB5D;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAYpB;AAED,MAAM,MAAM,wBAAwB,GAAG,CACrC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,KAAK,CAAC;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,KAC1D,OAAO,CAAC,KAAK,CAAC;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAAC;AAE9D,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,GAAG,qBAAqB,GAC3C,SAAS,IAAI,qBAAqB,CAMpC;AAED,qBAAa,sCACX,YAAW,wBAAwB;;WA2Df,MAAM,CACxB,eAAe,EAAE,MAAM,EACvB,gBAAgB,GAAE,wBAK4C,GAC7D,OAAO,CAAC,sCAAsC,CAAC;IAmBlD,OAAO;IASA,wBAAwB,IAAI,kBAAkB;IAIrD;;;;;;;;;;;;;OAaG;IACU,mCAAmC,CAC9C,IAAI,EAAE,kBAAkB,EACxB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CACR;QAAE,OAAO,EAAE,kBAAkB,CAAC;QAAC,kBAAkB,EAAE,SAAS,CAAA;KAAE,GAAG,SAAS,CAC3E;IAqGY,uBAAuB,CAClC,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAgD9D,4BAA4B,CACvC,cAAc,EAAE,kBAAkB,EAClC,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC,SAAS,CAAC;IA6Bd,MAAM,IAAI,4BAA4B;CA+X9C"}
|
|
@@ -8,6 +8,26 @@ import { parseRemappingString, selectBestRemapping } from "./remappings.js";
|
|
|
8
8
|
import { sourceNamePathJoin } from "./source-name-utils.js";
|
|
9
9
|
import { UserRemappingType } from "./types.js";
|
|
10
10
|
const HARDHAT_PROJECT_INPUT_SOURCE_NAME_ROOT = "project";
|
|
11
|
+
/**
|
|
12
|
+
* Returns a normalized version of the path if it refers to a node_modules in
|
|
13
|
+
* the root directory (i.e. node_modules/...), or a `node_modules` directory
|
|
14
|
+
* in a parent directory (i.e. ../../node_modules/...).
|
|
15
|
+
*
|
|
16
|
+
* Otherwise returns `undefined`.
|
|
17
|
+
*
|
|
18
|
+
* @param pathToNormalize The path to normalize.
|
|
19
|
+
* @returns The normalized path (node_modules/...), or `undefined`.
|
|
20
|
+
*/
|
|
21
|
+
export function getNormalizeNodeModulesPath(pathToNormalize) {
|
|
22
|
+
if (pathToNormalize.startsWith("node_modules/")) {
|
|
23
|
+
return pathToNormalize;
|
|
24
|
+
}
|
|
25
|
+
const normalized = path.posix.normalize(pathToNormalize);
|
|
26
|
+
if (!/^(?:\.\.\/)*node_modules\//.test(normalized)) {
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
return normalized.substring(normalized.indexOf("node_modules/"));
|
|
30
|
+
}
|
|
11
31
|
export function isResolvedUserRemapping(remapping) {
|
|
12
32
|
return ("type" in remapping &&
|
|
13
33
|
(remapping.type === UserRemappingType.NPM ||
|
|
@@ -314,15 +334,16 @@ export class RemappedNpmPackagesGraphImplementation {
|
|
|
314
334
|
const prefix = remapping.prefix.endsWith("/")
|
|
315
335
|
? remapping.prefix
|
|
316
336
|
: remapping.prefix + "/";
|
|
317
|
-
|
|
337
|
+
let target = remapping.target.endsWith("/")
|
|
318
338
|
? remapping.target
|
|
319
339
|
: remapping.target + "/";
|
|
320
340
|
const relativeFsPathToRemappingsFile = path.relative(npmPackage.rootFsPath, path.dirname(sourceOfTheRemapping));
|
|
321
|
-
// If the remapping's target starts with `node_modules/`, we treat
|
|
322
|
-
//
|
|
341
|
+
// If the remapping's target starts with `node_modules/`, we treat it as
|
|
342
|
+
// trying to load an npm dependency, otherwise we treat it as a local
|
|
323
343
|
// remapping.
|
|
344
|
+
const normalizedNodeModulesTarget = getNormalizeNodeModulesPath(target);
|
|
324
345
|
// Local remapping case
|
|
325
|
-
if (
|
|
346
|
+
if (normalizedNodeModulesTarget === undefined) {
|
|
326
347
|
return {
|
|
327
348
|
success: true,
|
|
328
349
|
value: {
|
|
@@ -335,11 +356,15 @@ export class RemappedNpmPackagesGraphImplementation {
|
|
|
335
356
|
},
|
|
336
357
|
};
|
|
337
358
|
}
|
|
359
|
+
else {
|
|
360
|
+
// We update the target to the normalized version
|
|
361
|
+
target = normalizedNodeModulesTarget;
|
|
362
|
+
}
|
|
338
363
|
// If we are here the remapping is a npm remapping.
|
|
339
364
|
// We first remove the node_modules/ prefix from the actual target.
|
|
340
365
|
const targetWithoutNodeModules = target.substring("node_modules/".length);
|
|
341
366
|
// If after doing that the prefix and target are the same, we skip it
|
|
342
|
-
// so that it doesn't even go
|
|
367
|
+
// so that it doesn't even go unnecessarily go through a user remapping.
|
|
343
368
|
if (prefix === targetWithoutNodeModules) {
|
|
344
369
|
return { success: true, value: undefined };
|
|
345
370
|
}
|