hardhat 2.13.0-dev.2 → 2.13.0-dev.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/builtin-tasks/compile.js +16 -6
- package/builtin-tasks/compile.js.map +1 -1
- package/builtin-tasks/flatten.js +1 -1
- package/builtin-tasks/flatten.js.map +1 -1
- package/builtin-tasks/help.js +2 -4
- package/builtin-tasks/help.js.map +1 -1
- package/builtin-tasks/task-names.d.ts +1 -0
- package/builtin-tasks/task-names.d.ts.map +1 -1
- package/builtin-tasks/task-names.js +3 -2
- package/builtin-tasks/task-names.js.map +1 -1
- package/builtin-tasks/test.js +22 -1
- package/builtin-tasks/test.js.map +1 -1
- package/internal/cli/bootstrap.d.ts +1 -0
- package/internal/cli/bootstrap.js +12 -20
- package/internal/cli/bootstrap.js.map +1 -1
- package/internal/cli/cli.d.ts +0 -1
- package/internal/cli/cli.d.ts.map +1 -1
- package/internal/cli/cli.js +20 -29
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.d.ts +1 -2
- package/internal/cli/project-creation.d.ts.map +1 -1
- package/internal/cli/project-creation.js +105 -36
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/cli/prompt.d.ts +2 -2
- package/internal/cli/prompt.d.ts.map +1 -1
- package/internal/cli/prompt.js +1 -2
- package/internal/cli/prompt.js.map +1 -1
- package/internal/cli/types.d.ts +1 -0
- package/internal/cli/types.d.ts.map +1 -1
- package/internal/core/config/config-env.d.ts +5 -11
- package/internal/core/config/config-env.d.ts.map +1 -1
- package/internal/core/config/config-env.js +2 -13
- package/internal/core/config/config-env.js.map +1 -1
- package/internal/core/config/config-loading.d.ts +2 -1
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js +25 -7
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/config/config-validation.d.ts +2 -0
- package/internal/core/config/config-validation.d.ts.map +1 -1
- package/internal/core/config/config-validation.js +18 -1
- package/internal/core/config/config-validation.js.map +1 -1
- package/internal/core/config/extenders.d.ts +4 -7
- package/internal/core/config/extenders.d.ts.map +1 -1
- package/internal/core/config/extenders.js +5 -12
- package/internal/core/config/extenders.js.map +1 -1
- package/internal/core/errors-list.d.ts +28 -7
- package/internal/core/errors-list.d.ts.map +1 -1
- package/internal/core/errors-list.js +33 -10
- package/internal/core/errors-list.js.map +1 -1
- package/internal/core/jsonrpc/types/input/blockTag.d.ts +3 -3
- package/internal/core/jsonrpc/types/input/blockTag.d.ts.map +1 -1
- package/internal/core/project-structure.d.ts.map +1 -1
- package/internal/core/project-structure.js +6 -0
- package/internal/core/project-structure.js.map +1 -1
- package/internal/core/providers/construction.d.ts.map +1 -1
- package/internal/core/providers/construction.js +25 -5
- package/internal/core/providers/construction.js.map +1 -1
- package/internal/core/providers/http.d.ts +2 -2
- package/internal/core/providers/http.d.ts.map +1 -1
- package/internal/core/providers/http.js +41 -19
- package/internal/core/providers/http.js.map +1 -1
- package/internal/core/runtime-environment.d.ts +4 -2
- package/internal/core/runtime-environment.d.ts.map +1 -1
- package/internal/core/runtime-environment.js +39 -47
- package/internal/core/runtime-environment.js.map +1 -1
- package/internal/core/tasks/dsl.d.ts +6 -6
- package/internal/core/tasks/dsl.d.ts.map +1 -1
- package/internal/core/tasks/dsl.js.map +1 -1
- package/internal/core/tasks/task-definitions.d.ts +2 -2
- package/internal/core/tasks/task-definitions.d.ts.map +1 -1
- package/internal/core/tasks/task-definitions.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/handler.d.ts +1 -0
- package/internal/hardhat-network/jsonrpc/handler.d.ts.map +1 -1
- package/internal/hardhat-network/jsonrpc/handler.js +13 -18
- package/internal/hardhat-network/jsonrpc/handler.js.map +1 -1
- package/internal/hardhat-network/provider/RethnetState.d.ts +26 -0
- package/internal/hardhat-network/provider/RethnetState.d.ts.map +1 -0
- package/internal/hardhat-network/provider/RethnetState.js +84 -0
- package/internal/hardhat-network/provider/RethnetState.js.map +1 -0
- package/internal/hardhat-network/provider/modules/evm.d.ts +2 -1
- package/internal/hardhat-network/provider/modules/evm.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/evm.js +10 -4
- package/internal/hardhat-network/provider/modules/evm.js.map +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.d.ts +1 -0
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +6 -4
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/provider.d.ts +25 -21
- package/internal/hardhat-network/provider/provider.d.ts.map +1 -1
- package/internal/hardhat-network/provider/provider.js +25 -42
- package/internal/hardhat-network/provider/provider.js.map +1 -1
- package/internal/hardhat-network/provider/return-data.js +2 -2
- package/internal/hardhat-network/provider/return-data.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js +4 -2
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js +4 -2
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js +4 -2
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js.map +1 -1
- package/internal/hardhat-network/provider/utils/bloom.d.ts +32 -0
- package/internal/hardhat-network/provider/utils/bloom.d.ts.map +1 -0
- package/internal/hardhat-network/provider/utils/bloom.js +79 -0
- package/internal/hardhat-network/provider/utils/bloom.js.map +1 -0
- package/internal/hardhat-network/provider/utils/convertToRethnet.d.ts +12 -0
- package/internal/hardhat-network/provider/utils/convertToRethnet.d.ts.map +1 -0
- package/internal/hardhat-network/provider/utils/convertToRethnet.js +162 -0
- package/internal/hardhat-network/provider/utils/convertToRethnet.js.map +1 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.d.ts +7 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.d.ts.map +1 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.js +31 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.js.map +1 -0
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js +2 -2
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js.map +1 -1
- package/internal/hardhat-network/provider/vm/block-builder.d.ts +31 -0
- package/internal/hardhat-network/provider/vm/block-builder.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/block-builder.js +151 -0
- package/internal/hardhat-network/provider/vm/block-builder.js.map +1 -0
- package/internal/hardhat-network/provider/vm/creation.d.ts +10 -0
- package/internal/hardhat-network/provider/vm/creation.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/creation.js +29 -0
- package/internal/hardhat-network/provider/vm/creation.js.map +1 -0
- package/internal/hardhat-network/provider/vm/dual.d.ts +43 -0
- package/internal/hardhat-network/provider/vm/dual.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/dual.js +488 -0
- package/internal/hardhat-network/provider/vm/dual.js.map +1 -0
- package/internal/hardhat-network/provider/vm/ethereumjs.d.ts +56 -0
- package/internal/hardhat-network/provider/vm/ethereumjs.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/ethereumjs.js +416 -0
- package/internal/hardhat-network/provider/vm/ethereumjs.js.map +1 -0
- package/internal/hardhat-network/provider/vm/exit.d.ts +23 -0
- package/internal/hardhat-network/provider/vm/exit.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/exit.js +130 -0
- package/internal/hardhat-network/provider/vm/exit.js.map +1 -0
- package/internal/hardhat-network/provider/vm/rethnet.d.ts +99 -0
- package/internal/hardhat-network/provider/vm/rethnet.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/rethnet.js +284 -0
- package/internal/hardhat-network/provider/vm/rethnet.js.map +1 -0
- package/internal/hardhat-network/provider/vm/vm-adapter.d.ts +52 -0
- package/internal/hardhat-network/provider/vm/vm-adapter.d.ts.map +1 -0
- package/internal/hardhat-network/provider/vm/vm-adapter.js +3 -0
- package/internal/hardhat-network/provider/vm/vm-adapter.js.map +1 -0
- package/internal/hardhat-network/stack-traces/compiler-to-model.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/compiler-to-model.js +37 -11
- package/internal/hardhat-network/stack-traces/compiler-to-model.js.map +1 -1
- package/internal/hardhat-network/stack-traces/consoleLogger.js.map +1 -1
- package/internal/hardhat-network/stack-traces/constants.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/constants.js +1 -1
- package/internal/hardhat-network/stack-traces/debug.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/debug.js +6 -2
- package/internal/hardhat-network/stack-traces/debug.js.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.d.ts +1 -0
- package/internal/hardhat-network/stack-traces/error-inferrer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.js +85 -55
- package/internal/hardhat-network/stack-traces/error-inferrer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/model.d.ts +3 -1
- package/internal/hardhat-network/stack-traces/model.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/model.js +9 -1
- package/internal/hardhat-network/stack-traces/model.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js +2 -2
- package/internal/hardhat-network/stack-traces/solidity-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts +2 -2
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.js +1 -0
- package/internal/hardhat-network/stack-traces/solidityTracer.js.map +1 -1
- package/internal/lib/hardhat-lib.d.ts.map +1 -1
- package/internal/lib/hardhat-lib.js +1 -4
- package/internal/lib/hardhat-lib.js.map +1 -1
- package/internal/solidity/compiler/downloader.js +2 -2
- package/internal/solidity/compiler/downloader.js.map +1 -1
- package/internal/solidity/compiler/index.js +1 -1
- package/internal/solidity/compiler/index.js.map +1 -1
- package/internal/solidity/resolver.d.ts +4 -3
- package/internal/solidity/resolver.d.ts.map +1 -1
- package/internal/solidity/resolver.js +18 -7
- package/internal/solidity/resolver.js.map +1 -1
- package/internal/util/abi-helpers.d.ts +1 -0
- package/internal/util/abi-helpers.d.ts.map +1 -1
- package/internal/util/abi-helpers.js +9 -0
- package/internal/util/abi-helpers.js.map +1 -1
- package/internal/util/download.d.ts.map +1 -1
- package/internal/util/download.js +12 -11
- package/internal/util/download.js.map +1 -1
- package/internal/util/packageInfo.d.ts +6 -1
- package/internal/util/packageInfo.d.ts.map +1 -1
- package/internal/util/packageInfo.js +14 -11
- package/internal/util/packageInfo.js.map +1 -1
- package/internal/util/proxy.d.ts +2 -0
- package/internal/util/proxy.d.ts.map +1 -0
- package/internal/util/proxy.js +19 -0
- package/internal/util/proxy.js.map +1 -0
- package/package.json +9 -10
- package/register.js +1 -4
- package/register.js.map +1 -1
- package/sample-projects/javascript/hardhat.config.js +1 -1
- package/sample-projects/javascript/scripts/deploy.js +2 -2
- package/sample-projects/javascript-esm/LICENSE.md +11 -0
- package/sample-projects/javascript-esm/README.md +13 -0
- package/sample-projects/javascript-esm/contracts/Lock.sol +34 -0
- package/sample-projects/javascript-esm/hardhat.config.cjs +6 -0
- package/sample-projects/javascript-esm/scripts/deploy.js +22 -0
- package/sample-projects/javascript-esm/test/Lock.js +123 -0
- package/sample-projects/typescript/hardhat.config.ts +1 -1
- package/sample-projects/typescript/scripts/deploy.ts +2 -2
- package/sample-projects/typescript/tsconfig.json +2 -1
- package/src/builtin-tasks/compile.ts +28 -7
- package/src/builtin-tasks/flatten.ts +4 -1
- package/src/builtin-tasks/help.ts +15 -16
- package/src/builtin-tasks/task-names.ts +2 -0
- package/src/builtin-tasks/test.ts +30 -2
- package/src/internal/artifacts.ts +947 -0
- package/src/internal/cli/bootstrap.ts +14 -36
- package/src/internal/cli/cli.ts +38 -43
- package/src/internal/cli/project-creation.ts +128 -47
- package/src/internal/cli/prompt.ts +2 -4
- package/src/internal/cli/types.ts +2 -0
- package/src/internal/core/config/config-env.ts +15 -27
- package/src/internal/core/config/config-loading.ts +35 -11
- package/src/internal/core/config/config-validation.ts +20 -0
- package/src/internal/core/config/extenders.ts +6 -15
- package/src/internal/core/errors-list.ts +36 -10
- package/src/internal/core/project-structure.ts +8 -0
- package/src/internal/core/providers/construction.ts +29 -24
- package/src/internal/core/providers/http.ts +38 -26
- package/src/internal/core/runtime-environment.ts +65 -60
- package/src/internal/core/tasks/dsl.ts +17 -17
- package/src/internal/core/tasks/task-definitions.ts +6 -2
- package/src/internal/hardhat-network/jsonrpc/handler.ts +31 -28
- package/src/internal/hardhat-network/provider/modules/evm.ts +15 -3
- package/src/internal/hardhat-network/provider/node-types.ts +1 -1
- package/src/internal/hardhat-network/provider/node.ts +5 -1
- package/src/internal/hardhat-network/provider/provider.ts +60 -49
- package/src/internal/hardhat-network/provider/return-data.ts +2 -2
- package/src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts +5 -2
- package/src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts +5 -2
- package/src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts +5 -2
- package/src/internal/hardhat-network/provider/utils/makeFakeSignature.ts +46 -0
- package/src/internal/hardhat-network/provider/utils/putGenesisBlock.ts +2 -2
- package/src/internal/hardhat-network/stack-traces/compiler-to-model.ts +71 -9
- package/src/internal/hardhat-network/stack-traces/consoleLogger.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/constants.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/debug.ts +9 -2
- package/src/internal/hardhat-network/stack-traces/error-inferrer.ts +177 -89
- package/src/internal/hardhat-network/stack-traces/model.ts +11 -1
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +2 -2
- package/src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts +2 -2
- package/src/internal/hardhat-network/stack-traces/solidityTracer.ts +3 -0
- package/src/internal/lib/hardhat-lib.ts +1 -6
- package/src/internal/solidity/compiler/downloader.ts +2 -2
- package/src/internal/solidity/compiler/index.ts +1 -1
- package/src/internal/solidity/resolver.ts +28 -11
- package/src/internal/util/abi-helpers.ts +9 -0
- package/src/internal/util/download.ts +13 -15
- package/src/internal/util/packageInfo.ts +24 -10
- package/src/internal/util/proxy.ts +18 -0
- package/src/register.ts +1 -6
- package/src/types/artifacts.ts +14 -112
- package/src/types/config.ts +2 -0
- package/src/types/runtime.ts +16 -13
- package/types/artifacts.d.ts +10 -96
- package/types/artifacts.d.ts.map +1 -1
- package/types/config.d.ts +2 -0
- package/types/config.d.ts.map +1 -1
- package/types/runtime.d.ts +9 -10
- package/types/runtime.d.ts.map +1 -1
- package/internal/artifacts/caching.d.ts +0 -28
- package/internal/artifacts/caching.d.ts.map +0 -1
- package/internal/artifacts/caching.js +0 -178
- package/internal/artifacts/caching.js.map +0 -1
- package/internal/artifacts/index.d.ts +0 -45
- package/internal/artifacts/index.d.ts.map +0 -1
- package/internal/artifacts/index.js +0 -191
- package/internal/artifacts/index.js.map +0 -1
- package/internal/artifacts/mutable.d.ts +0 -29
- package/internal/artifacts/mutable.d.ts.map +0 -1
- package/internal/artifacts/mutable.js +0 -226
- package/internal/artifacts/mutable.js.map +0 -1
- package/internal/artifacts/readonly.d.ts +0 -94
- package/internal/artifacts/readonly.d.ts.map +0 -1
- package/internal/artifacts/readonly.js +0 -343
- package/internal/artifacts/readonly.js.map +0 -1
- package/src/internal/artifacts/caching.ts +0 -259
- package/src/internal/artifacts/index.ts +0 -302
- package/src/internal/artifacts/mutable.ts +0 -330
- package/src/internal/artifacts/readonly.ts +0 -470
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-creation.d.ts","sourceRoot":"","sources":["../../src/internal/cli/project-creation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project-creation.d.ts","sourceRoot":"","sources":["../../src/internal/cli/project-creation.ts"],"names":[],"mappings":"AAqOA,eAAO,MAAM,oBAAoB,+GAIhC,CAAC;AA4FF,wBAAsB,aAAa,kBAiJlC"}
|
|
@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.createProject = exports.
|
|
25
|
+
exports.createProject = exports.EMPTY_HARDHAT_CONFIG = void 0;
|
|
26
26
|
const chalk_1 = __importDefault(require("chalk"));
|
|
27
27
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
28
28
|
const os_1 = __importDefault(require("os"));
|
|
@@ -31,6 +31,7 @@ const constants_1 = require("../constants");
|
|
|
31
31
|
const errors_1 = require("../core/errors");
|
|
32
32
|
const errors_list_1 = require("../core/errors-list");
|
|
33
33
|
const project_structure_1 = require("../core/project-structure");
|
|
34
|
+
const fs_utils_1 = require("../util/fs-utils");
|
|
34
35
|
const global_dir_1 = require("../util/global-dir");
|
|
35
36
|
const lang_1 = require("../util/lang");
|
|
36
37
|
const packageInfo_1 = require("../util/packageInfo");
|
|
@@ -67,7 +68,7 @@ const PEER_DEPENDENCIES = {
|
|
|
67
68
|
const TYPESCRIPT_DEPENDENCIES = {};
|
|
68
69
|
const TYPESCRIPT_PEER_DEPENDENCIES = {
|
|
69
70
|
"@types/chai": "^4.2.0",
|
|
70
|
-
"@types/mocha": "
|
|
71
|
+
"@types/mocha": ">=9.1.0",
|
|
71
72
|
"@types/node": ">=12.0.0",
|
|
72
73
|
"ts-node": ">=8.0.0",
|
|
73
74
|
typescript: ">=4.5.0",
|
|
@@ -88,27 +89,61 @@ async function printWelcomeMessage() {
|
|
|
88
89
|
const packageJson = await (0, packageInfo_1.getPackageJson)();
|
|
89
90
|
console.log(chalk_1.default.cyan(`${(0, emoji_1.emoji)("👷 ")}Welcome to ${constants_1.HARDHAT_NAME} v${packageJson.version}${(0, emoji_1.emoji)(" 👷")}\n`));
|
|
90
91
|
}
|
|
91
|
-
async function copySampleProject(projectRoot, projectType) {
|
|
92
|
+
async function copySampleProject(projectRoot, projectType, isEsm) {
|
|
92
93
|
const packageRoot = (0, packageInfo_1.getPackageRoot)();
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
let sampleProjectName;
|
|
95
|
+
if (projectType === Action.CREATE_JAVASCRIPT_PROJECT_ACTION) {
|
|
96
|
+
if (isEsm) {
|
|
97
|
+
sampleProjectName = "javascript-esm";
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
sampleProjectName = "javascript";
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
if (isEsm) {
|
|
105
|
+
(0, errors_1.assertHardhatInvariant)(false, "Shouldn't try to create a TypeScript project in an ESM based project");
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
sampleProjectName = "typescript";
|
|
109
|
+
}
|
|
110
|
+
}
|
|
96
111
|
await fs_extra_1.default.ensureDir(projectRoot);
|
|
97
112
|
const sampleProjectPath = path_1.default.join(packageRoot, "sample-projects", sampleProjectName);
|
|
98
|
-
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
113
|
+
// relative paths to all the sample project files
|
|
114
|
+
const sampleProjectFiles = (await (0, fs_utils_1.getAllFilesMatching)(sampleProjectPath)).map((file) => path_1.default.relative(sampleProjectPath, file));
|
|
115
|
+
// check if the target directory already has files that clash with the sample
|
|
116
|
+
// project files
|
|
117
|
+
const existingFiles = [];
|
|
118
|
+
for (const file of sampleProjectFiles) {
|
|
119
|
+
const targetProjectFile = path_1.default.resolve(projectRoot, file);
|
|
120
|
+
// if the project already has a README.md file, we'll skip it when
|
|
121
|
+
// we copy the files
|
|
122
|
+
if (file !== "README.md" && fs_extra_1.default.existsSync(targetProjectFile)) {
|
|
123
|
+
existingFiles.push(file);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
103
126
|
if (existingFiles.length > 0) {
|
|
104
127
|
const errorMsg = `We couldn't initialize the sample project because ${(0, strings_1.pluralize)(existingFiles.length, "this file already exists", "these files already exist")}: ${existingFiles.join(", ")}
|
|
105
128
|
|
|
106
|
-
Please delete or
|
|
129
|
+
Please delete or rename ${(0, strings_1.pluralize)(existingFiles.length, "it", "them")} and try again.`;
|
|
107
130
|
console.log(chalk_1.default.red(errorMsg));
|
|
108
131
|
process.exit(1);
|
|
109
132
|
}
|
|
110
|
-
|
|
111
|
-
|
|
133
|
+
// copy the files
|
|
134
|
+
for (const file of sampleProjectFiles) {
|
|
135
|
+
const sampleProjectFile = path_1.default.resolve(sampleProjectPath, file);
|
|
136
|
+
const targetProjectFile = path_1.default.resolve(projectRoot, file);
|
|
137
|
+
if (file === "README.md" && fs_extra_1.default.existsSync(targetProjectFile)) {
|
|
138
|
+
// we don't override the readme if it exists
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
if (file === "LICENSE.md") {
|
|
142
|
+
// we don't copy the license
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
fs_extra_1.default.copySync(sampleProjectFile, targetProjectFile);
|
|
146
|
+
}
|
|
112
147
|
}
|
|
113
148
|
async function addGitIgnore(projectRoot) {
|
|
114
149
|
const gitIgnorePath = path_1.default.join(projectRoot, ".gitignore");
|
|
@@ -128,13 +163,16 @@ async function printRecommendedDepsInstallationInstructions(projectType) {
|
|
|
128
163
|
// exported so we can test that it uses the latest supported version of solidity
|
|
129
164
|
exports.EMPTY_HARDHAT_CONFIG = `/** @type import('hardhat/config').HardhatUserConfig */
|
|
130
165
|
module.exports = {
|
|
131
|
-
solidity: "0.8.
|
|
166
|
+
solidity: "0.8.18",
|
|
132
167
|
};
|
|
133
168
|
`;
|
|
134
|
-
async function writeEmptyHardhatConfig() {
|
|
135
|
-
|
|
169
|
+
async function writeEmptyHardhatConfig(isEsm) {
|
|
170
|
+
const hardhatConfigFilename = isEsm
|
|
171
|
+
? "hardhat.config.cjs"
|
|
172
|
+
: "hardhat.config.js";
|
|
173
|
+
return fs_extra_1.default.writeFile(hardhatConfigFilename, exports.EMPTY_HARDHAT_CONFIG, "utf-8");
|
|
136
174
|
}
|
|
137
|
-
async function getAction() {
|
|
175
|
+
async function getAction(isEsm) {
|
|
138
176
|
if (process.env.HARDHAT_CREATE_JAVASCRIPT_PROJECT_WITH_DEFAULTS !== undefined) {
|
|
139
177
|
return Action.CREATE_JAVASCRIPT_PROJECT_ACTION;
|
|
140
178
|
}
|
|
@@ -150,7 +188,26 @@ async function getAction() {
|
|
|
150
188
|
message: "What do you want to do?",
|
|
151
189
|
initial: 0,
|
|
152
190
|
choices: Object.values(Action).map((a) => {
|
|
153
|
-
|
|
191
|
+
let message;
|
|
192
|
+
if (isEsm) {
|
|
193
|
+
if (a === Action.CREATE_EMPTY_HARDHAT_CONFIG_ACTION) {
|
|
194
|
+
message = a.replace(".js", ".cjs");
|
|
195
|
+
}
|
|
196
|
+
else if (a === Action.CREATE_TYPESCRIPT_PROJECT_ACTION) {
|
|
197
|
+
message = `${a} (not available for ESM projects)`;
|
|
198
|
+
}
|
|
199
|
+
else {
|
|
200
|
+
message = a;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
message = a;
|
|
205
|
+
}
|
|
206
|
+
return {
|
|
207
|
+
name: a,
|
|
208
|
+
message,
|
|
209
|
+
value: a,
|
|
210
|
+
};
|
|
154
211
|
}),
|
|
155
212
|
},
|
|
156
213
|
]);
|
|
@@ -182,27 +239,26 @@ function showStarOnGitHubMessage() {
|
|
|
182
239
|
console.log();
|
|
183
240
|
console.log(chalk_1.default.cyan(" https://github.com/NomicFoundation/hardhat"));
|
|
184
241
|
}
|
|
185
|
-
function showSoliditySurveyMessage() {
|
|
186
|
-
if (new Date() > new Date("2023-07-01 23:39")) {
|
|
187
|
-
// the survey has finished
|
|
188
|
-
return;
|
|
189
|
-
}
|
|
190
|
-
console.log();
|
|
191
|
-
console.log(chalk_1.default.cyan("Please take a moment to complete the 2022 Solidity Survey: https://hardhat.org/solidity-survey-2022"));
|
|
192
|
-
}
|
|
193
|
-
exports.showSoliditySurveyMessage = showSoliditySurveyMessage;
|
|
194
242
|
async function createProject() {
|
|
195
243
|
printAsciiLogo();
|
|
196
244
|
await printWelcomeMessage();
|
|
197
|
-
|
|
245
|
+
let packageJson;
|
|
246
|
+
if (await fs_extra_1.default.pathExists("package.json")) {
|
|
247
|
+
packageJson = await fs_extra_1.default.readJson("package.json");
|
|
248
|
+
}
|
|
249
|
+
const isEsm = packageJson?.type === "module";
|
|
250
|
+
const action = await getAction(isEsm);
|
|
198
251
|
if (action === Action.QUIT_ACTION) {
|
|
199
252
|
return;
|
|
200
253
|
}
|
|
201
|
-
if (
|
|
254
|
+
if (isEsm && action === Action.CREATE_TYPESCRIPT_PROJECT_ACTION) {
|
|
255
|
+
throw new errors_1.HardhatError(errors_list_1.ERRORS.GENERAL.ESM_TYPESCRIPT_PROJECT_CREATION);
|
|
256
|
+
}
|
|
257
|
+
if (packageJson === undefined) {
|
|
202
258
|
await createPackageJson();
|
|
203
259
|
}
|
|
204
260
|
if (action === Action.CREATE_EMPTY_HARDHAT_CONFIG_ACTION) {
|
|
205
|
-
await writeEmptyHardhatConfig();
|
|
261
|
+
await writeEmptyHardhatConfig(isEsm);
|
|
206
262
|
console.log(`${(0, emoji_1.emoji)("✨ ")}${chalk_1.default.cyan(`Config file created`)}${(0, emoji_1.emoji)(" ✨")}`);
|
|
207
263
|
if (!isInstalled(HARDHAT_PACKAGE_NAME)) {
|
|
208
264
|
console.log("");
|
|
@@ -216,7 +272,6 @@ async function createProject() {
|
|
|
216
272
|
}
|
|
217
273
|
console.log();
|
|
218
274
|
showStarOnGitHubMessage();
|
|
219
|
-
showSoliditySurveyMessage();
|
|
220
275
|
return;
|
|
221
276
|
}
|
|
222
277
|
let responses;
|
|
@@ -250,7 +305,7 @@ async function createProject() {
|
|
|
250
305
|
(0, global_dir_1.writeTelemetryConsent)(telemetryConsent);
|
|
251
306
|
}
|
|
252
307
|
}
|
|
253
|
-
await copySampleProject(projectRoot, action);
|
|
308
|
+
await copySampleProject(projectRoot, action, isEsm);
|
|
254
309
|
let shouldShowInstallationInstructions = true;
|
|
255
310
|
if (await canInstallRecommendedDeps()) {
|
|
256
311
|
const dependencies = await getDependencies(action);
|
|
@@ -263,7 +318,7 @@ async function createProject() {
|
|
|
263
318
|
}
|
|
264
319
|
else if (installedExceptHardhat.length === 0) {
|
|
265
320
|
const shouldInstall = useDefaultPromptResponses ||
|
|
266
|
-
(await (0, prompt_1.confirmRecommendedDepsInstallation)(dependenciesToInstall, await
|
|
321
|
+
(await (0, prompt_1.confirmRecommendedDepsInstallation)(dependenciesToInstall, await getProjectPackageManager()));
|
|
267
322
|
if (shouldInstall) {
|
|
268
323
|
const installed = await installRecommendedDependencies(dependenciesToInstall);
|
|
269
324
|
if (!installed) {
|
|
@@ -282,7 +337,6 @@ async function createProject() {
|
|
|
282
337
|
console.log("See the README.md file for some example tasks you can run");
|
|
283
338
|
console.log();
|
|
284
339
|
showStarOnGitHubMessage();
|
|
285
|
-
showSoliditySurveyMessage();
|
|
286
340
|
}
|
|
287
341
|
exports.createProject = createProject;
|
|
288
342
|
async function canInstallRecommendedDeps() {
|
|
@@ -303,6 +357,16 @@ function isInstalled(dep) {
|
|
|
303
357
|
async function isYarnProject() {
|
|
304
358
|
return fs_extra_1.default.pathExists("yarn.lock");
|
|
305
359
|
}
|
|
360
|
+
async function isPnpmProject() {
|
|
361
|
+
return fs_extra_1.default.pathExists("pnpm-lock.yaml");
|
|
362
|
+
}
|
|
363
|
+
async function getProjectPackageManager() {
|
|
364
|
+
if (await isYarnProject())
|
|
365
|
+
return "yarn";
|
|
366
|
+
if (await isPnpmProject())
|
|
367
|
+
return "pnpm";
|
|
368
|
+
return "npm";
|
|
369
|
+
}
|
|
306
370
|
async function doesNpmAutoInstallPeerDependencies() {
|
|
307
371
|
const { execSync } = require("child_process");
|
|
308
372
|
try {
|
|
@@ -347,10 +411,15 @@ async function getRecommendedDependenciesInstallationCommand(dependencies, quote
|
|
|
347
411
|
if (await isYarnProject()) {
|
|
348
412
|
return ["yarn", "add", "--dev", ...deps];
|
|
349
413
|
}
|
|
414
|
+
if (await isPnpmProject()) {
|
|
415
|
+
return ["pnpm", "add", "-D", ...deps];
|
|
416
|
+
}
|
|
350
417
|
return ["npm", "install", "--save-dev", ...deps];
|
|
351
418
|
}
|
|
352
419
|
async function getDependencies(projectType) {
|
|
353
|
-
const shouldInstallPeerDependencies = (await isYarnProject()) ||
|
|
420
|
+
const shouldInstallPeerDependencies = (await isYarnProject()) ||
|
|
421
|
+
(await isPnpmProject()) ||
|
|
422
|
+
!(await doesNpmAutoInstallPeerDependencies());
|
|
354
423
|
const shouldInstallTypescriptDependencies = projectType === Action.CREATE_TYPESCRIPT_PROJECT_ACTION;
|
|
355
424
|
const shouldInstallTypescriptPeerDependencies = shouldInstallTypescriptDependencies && shouldInstallPeerDependencies;
|
|
356
425
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-creation.js","sourceRoot":"","sources":["../../src/internal/cli/project-creation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-creation.js","sourceRoot":"","sources":["../../src/internal/cli/project-creation.ts"],"names":[],"mappings":"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"}
|
package/internal/cli/prompt.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Dependencies } from "./types";
|
|
2
|
-
export declare function confirmRecommendedDepsInstallation(depsToInstall: Dependencies,
|
|
1
|
+
import { Dependencies, PackageManager } from "./types";
|
|
2
|
+
export declare function confirmRecommendedDepsInstallation(depsToInstall: Dependencies, packageManager: PackageManager): Promise<boolean>;
|
|
3
3
|
export declare function confirmProjectCreation(): Promise<{
|
|
4
4
|
projectRoot: string;
|
|
5
5
|
shouldAddGitIgnore: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/internal/cli/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/internal/cli/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAoCvD,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,OAAO,CAAC,CA0BlB;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC,CAcD;AAED,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAK5E;AAED;;;;GAIG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAC1D,OAAO,GAAG,SAAS,CACpB,CAKA"}
|
package/internal/cli/prompt.js
CHANGED
|
@@ -49,10 +49,9 @@ function createConfirmationPrompt(name, message) {
|
|
|
49
49
|
},
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
|
-
async function confirmRecommendedDepsInstallation(depsToInstall,
|
|
52
|
+
async function confirmRecommendedDepsInstallation(depsToInstall, packageManager) {
|
|
53
53
|
const { default: enquirer } = await Promise.resolve().then(() => __importStar(require("enquirer")));
|
|
54
54
|
let responses;
|
|
55
|
-
const packageManager = useYarn ? "yarn" : "npm";
|
|
56
55
|
try {
|
|
57
56
|
responses = await enquirer.prompt([
|
|
58
57
|
createConfirmationPrompt("shouldInstallPlugin", `Do you want to install this sample project's dependencies with ${packageManager} (${Object.keys(depsToInstall).join(" ")})?`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/internal/cli/prompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAEA,SAAS,wBAAwB,CAAC,IAAY,EAAE,OAAe;IAC7D,OAAO;QACL,IAAI,EAAE,SAAS;QACf,IAAI;QACJ,OAAO;QACP,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,OAAO;QAChB,MAAM,CAAC,KAAuB;YAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,OAAO,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC;aACpC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,KAAuB;YAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,OAAO,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC;aACpC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM;YACJ,MAAM,IAAI,GAAG,IAAW,CAAC;YACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAE9C,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,IAAI,EAAE;gBACjC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aACrC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,kCAAkC,CACtD,aAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/internal/cli/prompt.ts"],"names":[],"mappings":"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"}
|
package/internal/cli/types.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internal/cli/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internal/cli/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAED,oBAAY,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ActionType,
|
|
1
|
+
import { ActionType, ConfigExtender, ConfigurableTaskDefinition, EnvironmentExtender, ExperimentalHardhatNetworkMessageTraceHook, TaskArguments } from "../../../types";
|
|
2
2
|
import * as argumentTypes from "../params/argumentTypes";
|
|
3
3
|
/**
|
|
4
4
|
* Creates a task, overriding any previous task with the same name.
|
|
@@ -10,7 +10,7 @@ import * as argumentTypes from "../params/argumentTypes";
|
|
|
10
10
|
* @param action The task's action.
|
|
11
11
|
* @returns A task definition.
|
|
12
12
|
*/
|
|
13
|
-
export declare function task<
|
|
13
|
+
export declare function task<TaskArgumentsT extends TaskArguments>(name: string, description?: string, action?: ActionType<TaskArgumentsT>): ConfigurableTaskDefinition;
|
|
14
14
|
/**
|
|
15
15
|
* Creates a task without description, overriding any previous task
|
|
16
16
|
* with the same name.
|
|
@@ -22,7 +22,7 @@ export declare function task<ArgsT extends TaskArguments>(name: string, descript
|
|
|
22
22
|
*
|
|
23
23
|
* @returns A task definition.
|
|
24
24
|
*/
|
|
25
|
-
export declare function task<
|
|
25
|
+
export declare function task<TaskArgumentsT extends TaskArguments>(name: string, action: ActionType<TaskArgumentsT>): ConfigurableTaskDefinition;
|
|
26
26
|
/**
|
|
27
27
|
* Creates a subtask, overriding any previous task with the same name.
|
|
28
28
|
*
|
|
@@ -34,7 +34,7 @@ export declare function task<ArgsT extends TaskArguments>(name: string, action:
|
|
|
34
34
|
* @param action The task's action.
|
|
35
35
|
* @returns A task definition.
|
|
36
36
|
*/
|
|
37
|
-
export declare function subtask<
|
|
37
|
+
export declare function subtask<TaskArgumentsT extends TaskArguments>(name: string, description?: string, action?: ActionType<TaskArgumentsT>): ConfigurableTaskDefinition;
|
|
38
38
|
/**
|
|
39
39
|
* Creates a subtask without description, overriding any previous
|
|
40
40
|
* task with the same name.
|
|
@@ -46,7 +46,7 @@ export declare function subtask<ArgsT extends TaskArguments>(name: string, descr
|
|
|
46
46
|
* @param action The task's action.
|
|
47
47
|
* @returns A task definition.
|
|
48
48
|
*/
|
|
49
|
-
export declare function subtask<
|
|
49
|
+
export declare function subtask<TaskArgumentsT extends TaskArguments>(name: string, action: ActionType<TaskArgumentsT>): ConfigurableTaskDefinition;
|
|
50
50
|
export declare const internalTask: typeof subtask;
|
|
51
51
|
export declare const types: typeof argumentTypes;
|
|
52
52
|
/**
|
|
@@ -58,11 +58,5 @@ export declare const types: typeof argumentTypes;
|
|
|
58
58
|
*/
|
|
59
59
|
export declare function extendEnvironment(extender: EnvironmentExtender): void;
|
|
60
60
|
export declare function extendConfig(extender: ConfigExtender): void;
|
|
61
|
-
/**
|
|
62
|
-
* Accepts a function that receives the resolved configuration and returns an
|
|
63
|
-
* extra source of artifacts. This source has to implement the ArtifactsSource
|
|
64
|
-
* interface.
|
|
65
|
-
*/
|
|
66
|
-
export declare function extendArtifacts(artifactsExtender: ArtifactsExtender): void;
|
|
67
61
|
export declare function experimentalAddHardhatNetworkMessageTraceHook(hook: ExperimentalHardhatNetworkMessageTraceHook): void;
|
|
68
62
|
//# sourceMappingURL=config-env.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-env.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/config-env.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"config-env.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/config-env.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,cAAc,EACd,0BAA0B,EAC1B,mBAAmB,EACnB,0CAA0C,EAC1C,aAAa,EACd,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AAEzD;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,cAAc,SAAS,aAAa,EACvD,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC,GAClC,0BAA0B,CAAC;AAE9B;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAAC,cAAc,SAAS,aAAa,EACvD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,GACjC,0BAA0B,CAAC;AAqB9B;;;;;;;;;;GAUG;AACH,wBAAgB,OAAO,CAAC,cAAc,SAAS,aAAa,EAC1D,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC,GAClC,0BAA0B,CAAC;AAE9B;;;;;;;;;;GAUG;AACH,wBAAgB,OAAO,CAAC,cAAc,SAAS,aAAa,EAC1D,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,GACjC,0BAA0B,CAAC;AAsB9B,eAAO,MAAM,YAAY,gBAAU,CAAC;AAEpC,eAAO,MAAM,KAAK,sBAAgB,CAAC;AAEnC;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,mBAAmB,QAI9D;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,cAAc,QAGpD;AAID,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,0CAA0C,QAIjD"}
|
|
@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.experimentalAddHardhatNetworkMessageTraceHook = exports.
|
|
22
|
+
exports.experimentalAddHardhatNetworkMessageTraceHook = exports.extendConfig = exports.extendEnvironment = exports.types = exports.internalTask = exports.subtask = exports.task = void 0;
|
|
23
23
|
const context_1 = require("../../context");
|
|
24
24
|
const argumentTypes = __importStar(require("../params/argumentTypes"));
|
|
25
25
|
function task(name, descriptionOrAction, action) {
|
|
@@ -59,7 +59,7 @@ exports.types = argumentTypes;
|
|
|
59
59
|
function extendEnvironment(extender) {
|
|
60
60
|
const ctx = context_1.HardhatContext.getHardhatContext();
|
|
61
61
|
const extenderManager = ctx.extendersManager;
|
|
62
|
-
extenderManager.
|
|
62
|
+
extenderManager.add(extender);
|
|
63
63
|
}
|
|
64
64
|
exports.extendEnvironment = extendEnvironment;
|
|
65
65
|
function extendConfig(extender) {
|
|
@@ -67,17 +67,6 @@ function extendConfig(extender) {
|
|
|
67
67
|
ctx.configExtenders.push(extender);
|
|
68
68
|
}
|
|
69
69
|
exports.extendConfig = extendConfig;
|
|
70
|
-
/**
|
|
71
|
-
* Accepts a function that receives the resolved configuration and returns an
|
|
72
|
-
* extra source of artifacts. This source has to implement the ArtifactsSource
|
|
73
|
-
* interface.
|
|
74
|
-
*/
|
|
75
|
-
function extendArtifacts(artifactsExtender) {
|
|
76
|
-
const ctx = context_1.HardhatContext.getHardhatContext();
|
|
77
|
-
const extenderManager = ctx.extendersManager;
|
|
78
|
-
extenderManager.addArtifactsExtender(artifactsExtender);
|
|
79
|
-
}
|
|
80
|
-
exports.extendArtifacts = extendArtifacts;
|
|
81
70
|
// NOTE: This is experimental and will be removed. Please contact our team
|
|
82
71
|
// if you are planning to use it.
|
|
83
72
|
function experimentalAddHardhatNetworkMessageTraceHook(hook) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-env.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-env.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config-env.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-env.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAQA,2CAA+C;AAC/C,uEAAyD;AAkCzD,SAAgB,IAAI,CAClB,IAAY,EACZ,mBAAyD,EACzD,MAAmC;IAEnC,MAAM,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC;IAEzB,IAAI,mBAAmB,KAAK,SAAS,EAAE;QACrC,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,IAAI,OAAO,mBAAmB,KAAK,QAAQ,EAAE;QAC3C,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;KAC5C;IAED,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC;AAjBD,oBAiBC;AAmCD,SAAgB,OAAO,CACrB,IAAY,EACZ,mBAAyD,EACzD,MAAmC;IAEnC,MAAM,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC;IAEzB,IAAI,mBAAmB,KAAK,SAAS,EAAE;QACrC,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC1B;IAED,IAAI,OAAO,mBAAmB,KAAK,QAAQ,EAAE;QAC3C,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;KAC/C;IAED,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;AACxD,CAAC;AAjBD,0BAiBC;AAED,gCAAgC;AACnB,QAAA,YAAY,GAAG,OAAO,CAAC;AAEvB,QAAA,KAAK,GAAG,aAAa,CAAC;AAEnC;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,QAA6B;IAC7D,MAAM,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;IAC7C,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAJD,8CAIC;AAED,SAAgB,YAAY,CAAC,QAAwB;IACnD,MAAM,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAC/C,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC;AAHD,oCAGC;AAED,0EAA0E;AAC1E,iCAAiC;AACjC,SAAgB,6CAA6C,CAC3D,IAAgD;IAEhD,MAAM,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAC/C,GAAG,CAAC,2CAA2C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC;AALD,sGAKC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { HardhatArguments, HardhatConfig, HardhatUserConfig } from "../../../types";
|
|
1
|
+
import { HardhatArguments, HardhatConfig, HardhatUserConfig, SolcConfig } from "../../../types";
|
|
2
2
|
export declare function resolveConfigPath(configPath: string | undefined): string;
|
|
3
3
|
export declare function loadConfigAndTasks(hardhatArguments?: Partial<HardhatArguments>, { showEmptyConfigWarning, showSolidityConfigWarnings, }?: {
|
|
4
4
|
showEmptyConfigWarning?: boolean;
|
|
@@ -15,4 +15,5 @@ export declare function loadConfigAndTasks(hardhatArguments?: Partial<HardhatArg
|
|
|
15
15
|
* nothing.
|
|
16
16
|
*/
|
|
17
17
|
export declare function analyzeModuleNotFoundError(error: any, configPath: string): void;
|
|
18
|
+
export declare function getConfiguredCompilers(solidityConfig: HardhatConfig["solidity"]): SolcConfig[];
|
|
18
19
|
//# sourceMappingURL=config-loading.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loading.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,iBAAiB,
|
|
1
|
+
{"version":3,"file":"config-loading.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAgCxB,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,UAU/D;AAED,wBAAgB,kBAAkB,CAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAC5C,EACE,sBAA8B,EAC9B,0BAAkC,GACnC,GAAE;IACD,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,0BAA0B,CAAC,EAAE,OAAO,CAAC;CAItC,GACA;IAAE,cAAc,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,CA+DlE;AAiCD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,QAgExE;AAqGD,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,aAAa,CAAC,UAAU,CAAC,GACxC,UAAU,EAAE,CAId"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.analyzeModuleNotFoundError = exports.loadConfigAndTasks = exports.resolveConfigPath = void 0;
|
|
6
|
+
exports.getConfiguredCompilers = exports.analyzeModuleNotFoundError = exports.loadConfigAndTasks = exports.resolveConfigPath = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const debug_1 = __importDefault(require("debug"));
|
|
9
9
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
@@ -20,8 +20,17 @@ const config_validation_1 = require("./config-validation");
|
|
|
20
20
|
const default_config_1 = require("./default-config");
|
|
21
21
|
const log = (0, debug_1.default)("hardhat:core:config");
|
|
22
22
|
function importCsjOrEsModule(filePath) {
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
try {
|
|
24
|
+
const imported = require(filePath);
|
|
25
|
+
return imported.default !== undefined ? imported.default : imported;
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
if (e.code === "ERR_REQUIRE_ESM") {
|
|
29
|
+
throw new errors_1.HardhatError(errors_list_1.ERRORS.GENERAL.ESM_PROJECT_WITHOUT_CJS_CONFIG, {}, e);
|
|
30
|
+
}
|
|
31
|
+
// eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
|
|
32
|
+
throw e;
|
|
33
|
+
}
|
|
25
34
|
}
|
|
26
35
|
function resolveConfigPath(configPath) {
|
|
27
36
|
if (configPath === undefined) {
|
|
@@ -77,6 +86,7 @@ function loadConfigAndTasks(hardhatArguments, { showEmptyConfigWarning = false,
|
|
|
77
86
|
for (const extender of context_1.HardhatContext.getHardhatContext().configExtenders) {
|
|
78
87
|
extender(resolved, frozenUserConfig);
|
|
79
88
|
}
|
|
89
|
+
(0, config_validation_1.validateResolvedConfig)(resolved);
|
|
80
90
|
if (showSolidityConfigWarnings) {
|
|
81
91
|
checkUnsupportedSolidityConfig(resolved);
|
|
82
92
|
checkUnsupportedRemappings(resolved);
|
|
@@ -120,6 +130,8 @@ function analyzeModuleNotFoundError(error, configPath) {
|
|
|
120
130
|
const throwingFile = stackTrace
|
|
121
131
|
.filter((x) => x.file !== null)
|
|
122
132
|
.map((x) => x.file)
|
|
133
|
+
// ignore frames related to source map support
|
|
134
|
+
.filter((x) => !x.includes(path_1.default.join("@cspotcode", "source-map-support")))
|
|
123
135
|
.find((x) => path_1.default.isAbsolute(x));
|
|
124
136
|
if (throwingFile === null || throwingFile === undefined) {
|
|
125
137
|
return;
|
|
@@ -192,12 +204,12 @@ Learn more about compiler configuration at https://hardhat.org/config
|
|
|
192
204
|
}
|
|
193
205
|
}
|
|
194
206
|
function checkUnsupportedSolidityConfig(resolvedConfig) {
|
|
195
|
-
const
|
|
196
|
-
const
|
|
197
|
-
const solcVersions = [...compilerVersions, ...overrideVersions];
|
|
207
|
+
const configuredCompilers = getConfiguredCompilers(resolvedConfig.solidity);
|
|
208
|
+
const solcVersions = configuredCompilers.map((x) => x.version);
|
|
198
209
|
const unsupportedVersions = [];
|
|
199
210
|
for (const solcVersion of solcVersions) {
|
|
200
|
-
if (!semver_1.default.satisfies(solcVersion, constants_1.SUPPORTED_SOLIDITY_VERSION_RANGE)
|
|
211
|
+
if (!semver_1.default.satisfies(solcVersion, constants_1.SUPPORTED_SOLIDITY_VERSION_RANGE) &&
|
|
212
|
+
!unsupportedVersions.includes(solcVersion)) {
|
|
201
213
|
unsupportedVersions.push(solcVersion);
|
|
202
214
|
}
|
|
203
215
|
}
|
|
@@ -221,4 +233,10 @@ Learn more about compiler configuration at https://hardhat.org/config
|
|
|
221
233
|
`));
|
|
222
234
|
}
|
|
223
235
|
}
|
|
236
|
+
function getConfiguredCompilers(solidityConfig) {
|
|
237
|
+
const compilerVersions = solidityConfig.compilers;
|
|
238
|
+
const overrideVersions = Object.values(solidityConfig.overrides);
|
|
239
|
+
return [...compilerVersions, ...overrideVersions];
|
|
240
|
+
}
|
|
241
|
+
exports.getConfiguredCompilers = getConfiguredCompilers;
|
|
224
242
|
//# sourceMappingURL=config-loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA0B;AAC1B,kDAA0B;AAC1B,wDAA+B;AAC/B,gDAAwB;AACxB,oDAA4B;
|
|
1
|
+
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { HardhatConfig as HardhatConfigT } from "../../../types";
|
|
1
2
|
import * as t from "io-ts";
|
|
2
3
|
import { ValidationError } from "io-ts/lib";
|
|
3
4
|
import { Reporter } from "io-ts/lib/Reporter";
|
|
@@ -13,4 +14,5 @@ export declare const decimalString: t.Type<string, string, unknown>;
|
|
|
13
14
|
*/
|
|
14
15
|
export declare function validateConfig(config: any): void;
|
|
15
16
|
export declare function getValidationErrors(config: any): string[];
|
|
17
|
+
export declare function validateResolvedConfig(resolvedConfig: HardhatConfigT): void;
|
|
16
18
|
//# sourceMappingURL=config-validation.d.ts.map
|