hardhat 2.19.2 → 2.19.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/internal/cli/cli.js +10 -1
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.d.ts +1 -0
- package/internal/cli/project-creation.d.ts.map +1 -1
- package/internal/cli/project-creation.js +22 -8
- package/internal/cli/project-creation.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/solidity/compiler/solc-info.d.ts.map +1 -1
- package/internal/solidity/compiler/solc-info.js +1 -0
- package/internal/solidity/compiler/solc-info.js.map +1 -1
- package/package.json +1 -1
- package/sample-projects/javascript-esm/test/Lock.js +3 -1
- package/src/internal/cli/cli.ts +14 -2
- package/src/internal/cli/project-creation.ts +27 -9
- package/src/internal/hardhat-network/stack-traces/constants.ts +1 -1
- package/src/internal/solidity/compiler/solc-info.ts +1 -0
package/internal/cli/cli.js
CHANGED
|
@@ -224,6 +224,13 @@ async function main() {
|
|
|
224
224
|
!(0, ci_detection_1.isRunningOnCiServer)() &&
|
|
225
225
|
process.stdout.isTTY === true) {
|
|
226
226
|
await suggestInstallingHardhatVscode();
|
|
227
|
+
// we show the solidity survey message if the tests failed and only
|
|
228
|
+
// 1/3 of the time
|
|
229
|
+
if (process.exitCode !== 0 &&
|
|
230
|
+
Math.random() < 0.3333 &&
|
|
231
|
+
process.env.HARDHAT_HIDE_SOLIDITY_SURVEY_MESSAGE !== "true") {
|
|
232
|
+
(0, project_creation_1.showSoliditySurveyMessage)();
|
|
233
|
+
}
|
|
227
234
|
// we show the viaIR warning only if the tests failed
|
|
228
235
|
if (process.exitCode !== 0) {
|
|
229
236
|
showViaIRWarning(resolvedConfig);
|
|
@@ -283,7 +290,9 @@ async function createNewProject() {
|
|
|
283
290
|
}
|
|
284
291
|
if (process.stdout.isTTY === true ||
|
|
285
292
|
process.env.HARDHAT_CREATE_JAVASCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
286
|
-
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined
|
|
293
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
294
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_VIEM_PROJECT_WITH_DEFAULTS !==
|
|
295
|
+
undefined) {
|
|
287
296
|
await (0, project_creation_1.createProject)();
|
|
288
297
|
return;
|
|
289
298
|
}
|
package/internal/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/internal/cli/cli.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,kDAA0B;AAC1B,uCAAqC;AACrC,+DAIwC;AAExC,4CAA4C;AAC5C,wCAA4C;AAC5C,kEAGuC;AACvC,2CAIwB;AACxB,qDAA2D;AAC3D,2DAA2E;AAC3E,gEAAsE;AACtE,kEAA0E;AAC1E,iEAGmC;AACnC,qEAA0D;AAC1D,mEAA+E;AAC/E,iDAA8C;AAC9C,uDAA2D;AAC3D,mDAK4B;AAC5B,qDAAqD;AAErD,mDAAoD;AACpD,2CAAwC;AACxC,uDAAoD;AACpD,mCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/internal/cli/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export declare const EMPTY_HARDHAT_CONFIG = "/** @type import('hardhat/config').HardhatUserConfig */\nmodule.exports = {\n solidity: \"0.8.19\",\n};\n";
|
|
2
|
+
export declare function showSoliditySurveyMessage(): void;
|
|
2
3
|
export declare function createProject(): Promise<void>;
|
|
3
4
|
//# sourceMappingURL=project-creation.d.ts.map
|
|
@@ -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":"AA6PA,eAAO,MAAM,oBAAoB,+GAIhC,CAAC;AA2GF,wBAAgB,yBAAyB,SAYxC;AAED,wBAAsB,aAAa,kBAwJlC"}
|
|
@@ -26,10 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.createProject = exports.EMPTY_HARDHAT_CONFIG = void 0;
|
|
29
|
+
exports.createProject = exports.showSoliditySurveyMessage = exports.EMPTY_HARDHAT_CONFIG = void 0;
|
|
30
30
|
const chalk_1 = __importDefault(require("chalk"));
|
|
31
31
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
32
|
-
const os_1 = __importDefault(require("os"));
|
|
33
32
|
const path_1 = __importDefault(require("path"));
|
|
34
33
|
const constants_1 = require("../constants");
|
|
35
34
|
const errors_1 = require("../core/errors");
|
|
@@ -202,6 +201,10 @@ async function getAction(isEsm) {
|
|
|
202
201
|
else if (process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined) {
|
|
203
202
|
return Action.CREATE_TYPESCRIPT_PROJECT_ACTION;
|
|
204
203
|
}
|
|
204
|
+
else if (process.env.HARDHAT_CREATE_TYPESCRIPT_VIEM_PROJECT_WITH_DEFAULTS !==
|
|
205
|
+
undefined) {
|
|
206
|
+
return Action.CREATE_TYPESCRIPT_VIEM_PROJECT_ACTION;
|
|
207
|
+
}
|
|
205
208
|
const { default: enquirer } = await Promise.resolve().then(() => __importStar(require("enquirer")));
|
|
206
209
|
try {
|
|
207
210
|
const actionResponse = await enquirer.prompt([
|
|
@@ -271,6 +274,15 @@ function showStarOnGitHubMessage() {
|
|
|
271
274
|
console.log();
|
|
272
275
|
console.log(chalk_1.default.cyan(" https://github.com/NomicFoundation/hardhat"));
|
|
273
276
|
}
|
|
277
|
+
function showSoliditySurveyMessage() {
|
|
278
|
+
if (new Date() > new Date("2024-01-07 23:39")) {
|
|
279
|
+
// the survey has finished
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
console.log();
|
|
283
|
+
console.log(chalk_1.default.cyan("Please take a moment to complete the 2023 Solidity Survey: https://hardhat.org/solidity-survey-2023"));
|
|
284
|
+
}
|
|
285
|
+
exports.showSoliditySurveyMessage = showSoliditySurveyMessage;
|
|
274
286
|
async function createProject() {
|
|
275
287
|
printAsciiLogo();
|
|
276
288
|
await printWelcomeMessage();
|
|
@@ -304,11 +316,14 @@ async function createProject() {
|
|
|
304
316
|
}
|
|
305
317
|
console.log();
|
|
306
318
|
showStarOnGitHubMessage();
|
|
319
|
+
showSoliditySurveyMessage();
|
|
307
320
|
return;
|
|
308
321
|
}
|
|
309
322
|
let responses;
|
|
310
323
|
const useDefaultPromptResponses = process.env.HARDHAT_CREATE_JAVASCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
311
|
-
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined
|
|
324
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
325
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_VIEM_PROJECT_WITH_DEFAULTS !==
|
|
326
|
+
undefined;
|
|
312
327
|
if (useDefaultPromptResponses) {
|
|
313
328
|
responses = {
|
|
314
329
|
projectRoot: process.cwd(),
|
|
@@ -370,13 +385,11 @@ async function createProject() {
|
|
|
370
385
|
console.log("See the README.md file for some example tasks you can run");
|
|
371
386
|
console.log();
|
|
372
387
|
showStarOnGitHubMessage();
|
|
388
|
+
showSoliditySurveyMessage();
|
|
373
389
|
}
|
|
374
390
|
exports.createProject = createProject;
|
|
375
391
|
async function canInstallRecommendedDeps() {
|
|
376
|
-
return
|
|
377
|
-
// TODO: Figure out why this doesn't work on Win
|
|
378
|
-
// cf. https://github.com/nomiclabs/hardhat/issues/1698
|
|
379
|
-
os_1.default.type() !== "Windows_NT");
|
|
392
|
+
return fs_extra_1.default.pathExists("package.json");
|
|
380
393
|
}
|
|
381
394
|
function isInstalled(dep) {
|
|
382
395
|
const packageJson = fs_extra_1.default.readJSONSync("package.json");
|
|
@@ -413,7 +426,7 @@ async function doesNpmAutoInstallPeerDependencies() {
|
|
|
413
426
|
async function installRecommendedDependencies(dependencies) {
|
|
414
427
|
console.log("");
|
|
415
428
|
// The reason we don't quote the dependencies here is because they are going
|
|
416
|
-
// to be used in child_process.
|
|
429
|
+
// to be used in child_process.spawn, which doesn't require escaping string,
|
|
417
430
|
// and can actually fail if you do.
|
|
418
431
|
const installCmd = await getRecommendedDependenciesInstallationCommand(dependencies, false);
|
|
419
432
|
return installDependencies(installCmd[0], installCmd.slice(1));
|
|
@@ -423,6 +436,7 @@ async function installDependencies(packageManager, args) {
|
|
|
423
436
|
console.log(`${packageManager} ${args.join(" ")}`);
|
|
424
437
|
const childProcess = spawn(packageManager, args, {
|
|
425
438
|
stdio: "inherit",
|
|
439
|
+
shell: true,
|
|
426
440
|
});
|
|
427
441
|
return new Promise((resolve, reject) => {
|
|
428
442
|
childProcess.once("close", (status) => {
|
|
@@ -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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FIRST_SOLC_VERSION_SUPPORTED = exports.SUPPORTED_SOLIDITY_VERSION_RANGE = void 0;
|
|
4
|
-
exports.SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.
|
|
4
|
+
exports.SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.23";
|
|
5
5
|
exports.FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
|
|
6
6
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":"AAgEA,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAEpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solc-info.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAA8B;IACnD,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEF,SAAgB,4BAA4B,CAC1C,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC;AAJD,oEAIC"}
|
|
1
|
+
{"version":3,"file":"solc-info.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAA8B;IACnD,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEF,SAAgB,4BAA4B,CAC1C,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC;AAJD,oEAIC"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,9 @@ import {
|
|
|
3
3
|
loadFixture,
|
|
4
4
|
} from "@nomicfoundation/hardhat-toolbox/network-helpers.js";
|
|
5
5
|
import { anyValue } from "@nomicfoundation/hardhat-chai-matchers/withArgs.js";
|
|
6
|
-
import
|
|
6
|
+
import chai from "chai";
|
|
7
|
+
|
|
8
|
+
const { expect } = chai;
|
|
7
9
|
|
|
8
10
|
describe("Lock", function () {
|
|
9
11
|
// We define a fixture to reuse the same setup in every test.
|
package/src/internal/cli/cli.ts
CHANGED
|
@@ -42,7 +42,7 @@ import { saveFlamegraph } from "../core/flamegraph";
|
|
|
42
42
|
import { Analytics } from "./analytics";
|
|
43
43
|
import { ArgumentsParser } from "./ArgumentsParser";
|
|
44
44
|
import { enableEmoji } from "./emoji";
|
|
45
|
-
import { createProject } from "./project-creation";
|
|
45
|
+
import { createProject, showSoliditySurveyMessage } from "./project-creation";
|
|
46
46
|
import { confirmHHVSCodeInstallation, confirmTelemetryConsent } from "./prompt";
|
|
47
47
|
import {
|
|
48
48
|
InstallationState,
|
|
@@ -358,6 +358,16 @@ async function main() {
|
|
|
358
358
|
) {
|
|
359
359
|
await suggestInstallingHardhatVscode();
|
|
360
360
|
|
|
361
|
+
// we show the solidity survey message if the tests failed and only
|
|
362
|
+
// 1/3 of the time
|
|
363
|
+
if (
|
|
364
|
+
process.exitCode !== 0 &&
|
|
365
|
+
Math.random() < 0.3333 &&
|
|
366
|
+
process.env.HARDHAT_HIDE_SOLIDITY_SURVEY_MESSAGE !== "true"
|
|
367
|
+
) {
|
|
368
|
+
showSoliditySurveyMessage();
|
|
369
|
+
}
|
|
370
|
+
|
|
361
371
|
// we show the viaIR warning only if the tests failed
|
|
362
372
|
if (process.exitCode !== 0) {
|
|
363
373
|
showViaIRWarning(resolvedConfig);
|
|
@@ -435,7 +445,9 @@ async function createNewProject() {
|
|
|
435
445
|
if (
|
|
436
446
|
process.stdout.isTTY === true ||
|
|
437
447
|
process.env.HARDHAT_CREATE_JAVASCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
438
|
-
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined
|
|
448
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
449
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_VIEM_PROJECT_WITH_DEFAULTS !==
|
|
450
|
+
undefined
|
|
439
451
|
) {
|
|
440
452
|
await createProject();
|
|
441
453
|
return;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
2
|
import fsExtra from "fs-extra";
|
|
3
|
-
import os from "os";
|
|
4
3
|
import path from "path";
|
|
5
4
|
|
|
6
5
|
import { HARDHAT_NAME } from "../constants";
|
|
@@ -279,6 +278,11 @@ async function getAction(isEsm: boolean): Promise<Action> {
|
|
|
279
278
|
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined
|
|
280
279
|
) {
|
|
281
280
|
return Action.CREATE_TYPESCRIPT_PROJECT_ACTION;
|
|
281
|
+
} else if (
|
|
282
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_VIEM_PROJECT_WITH_DEFAULTS !==
|
|
283
|
+
undefined
|
|
284
|
+
) {
|
|
285
|
+
return Action.CREATE_TYPESCRIPT_VIEM_PROJECT_ACTION;
|
|
282
286
|
}
|
|
283
287
|
|
|
284
288
|
const { default: enquirer } = await import("enquirer");
|
|
@@ -358,6 +362,20 @@ function showStarOnGitHubMessage() {
|
|
|
358
362
|
console.log(chalk.cyan(" https://github.com/NomicFoundation/hardhat"));
|
|
359
363
|
}
|
|
360
364
|
|
|
365
|
+
export function showSoliditySurveyMessage() {
|
|
366
|
+
if (new Date() > new Date("2024-01-07 23:39")) {
|
|
367
|
+
// the survey has finished
|
|
368
|
+
return;
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
console.log();
|
|
372
|
+
console.log(
|
|
373
|
+
chalk.cyan(
|
|
374
|
+
"Please take a moment to complete the 2023 Solidity Survey: https://hardhat.org/solidity-survey-2023"
|
|
375
|
+
)
|
|
376
|
+
);
|
|
377
|
+
}
|
|
378
|
+
|
|
361
379
|
export async function createProject() {
|
|
362
380
|
printAsciiLogo();
|
|
363
381
|
|
|
@@ -403,6 +421,7 @@ export async function createProject() {
|
|
|
403
421
|
|
|
404
422
|
console.log();
|
|
405
423
|
showStarOnGitHubMessage();
|
|
424
|
+
showSoliditySurveyMessage();
|
|
406
425
|
|
|
407
426
|
return;
|
|
408
427
|
}
|
|
@@ -414,7 +433,9 @@ export async function createProject() {
|
|
|
414
433
|
|
|
415
434
|
const useDefaultPromptResponses =
|
|
416
435
|
process.env.HARDHAT_CREATE_JAVASCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
417
|
-
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined
|
|
436
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_PROJECT_WITH_DEFAULTS !== undefined ||
|
|
437
|
+
process.env.HARDHAT_CREATE_TYPESCRIPT_VIEM_PROJECT_WITH_DEFAULTS !==
|
|
438
|
+
undefined;
|
|
418
439
|
|
|
419
440
|
if (useDefaultPromptResponses) {
|
|
420
441
|
responses = {
|
|
@@ -506,15 +527,11 @@ export async function createProject() {
|
|
|
506
527
|
console.log("See the README.md file for some example tasks you can run");
|
|
507
528
|
console.log();
|
|
508
529
|
showStarOnGitHubMessage();
|
|
530
|
+
showSoliditySurveyMessage();
|
|
509
531
|
}
|
|
510
532
|
|
|
511
533
|
async function canInstallRecommendedDeps() {
|
|
512
|
-
return (
|
|
513
|
-
(await fsExtra.pathExists("package.json")) &&
|
|
514
|
-
// TODO: Figure out why this doesn't work on Win
|
|
515
|
-
// cf. https://github.com/nomiclabs/hardhat/issues/1698
|
|
516
|
-
os.type() !== "Windows_NT"
|
|
517
|
-
);
|
|
534
|
+
return fsExtra.pathExists("package.json");
|
|
518
535
|
}
|
|
519
536
|
|
|
520
537
|
function isInstalled(dep: string) {
|
|
@@ -557,7 +574,7 @@ async function installRecommendedDependencies(dependencies: Dependencies) {
|
|
|
557
574
|
console.log("");
|
|
558
575
|
|
|
559
576
|
// The reason we don't quote the dependencies here is because they are going
|
|
560
|
-
// to be used in child_process.
|
|
577
|
+
// to be used in child_process.spawn, which doesn't require escaping string,
|
|
561
578
|
// and can actually fail if you do.
|
|
562
579
|
const installCmd = await getRecommendedDependenciesInstallationCommand(
|
|
563
580
|
dependencies,
|
|
@@ -576,6 +593,7 @@ async function installDependencies(
|
|
|
576
593
|
|
|
577
594
|
const childProcess = spawn(packageManager, args, {
|
|
578
595
|
stdio: "inherit",
|
|
596
|
+
shell: true,
|
|
579
597
|
});
|
|
580
598
|
|
|
581
599
|
return new Promise((resolve, reject) => {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.
|
|
1
|
+
export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.23";
|
|
2
2
|
export const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
|