hardhat 2.19.3 → 2.19.5
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/README.md +6 -0
- package/builtin-tasks/compile.js +11 -2
- package/builtin-tasks/compile.js.map +1 -1
- package/internal/cli/analytics.d.ts +2 -0
- package/internal/cli/analytics.d.ts.map +1 -1
- package/internal/cli/analytics.js +37 -3
- package/internal/cli/analytics.js.map +1 -1
- package/internal/cli/cli.js +34 -4
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.d.ts.map +1 -1
- package/internal/cli/project-creation.js +7 -10
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/cli/version-notifier.d.ts +2 -0
- package/internal/cli/version-notifier.d.ts.map +1 -0
- package/internal/cli/version-notifier.js +217 -0
- package/internal/cli/version-notifier.js.map +1 -0
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js +3 -3
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/config/config-resolution.d.ts.map +1 -1
- package/internal/core/config/config-resolution.js +10 -6
- package/internal/core/config/config-resolution.js.map +1 -1
- package/internal/core/config/config-validation.d.ts +2 -2
- package/internal/core/config/config-validation.d.ts.map +1 -1
- package/internal/core/config/config-validation.js +2 -2
- package/internal/core/config/config-validation.js.map +1 -1
- package/internal/core/providers/gas-providers.d.ts.map +1 -1
- package/internal/core/providers/gas-providers.js +7 -0
- package/internal/core/providers/gas-providers.js.map +1 -1
- package/internal/hardhat-network/stack-traces/panic-errors.js +1 -1
- package/internal/hardhat-network/stack-traces/panic-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js +13 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js.map +1 -1
- package/internal/solidity/compiler/downloader.d.ts.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.d.ts +2 -1
- package/internal/solidity/compiler/index.d.ts.map +1 -1
- package/internal/solidity/compiler/index.js +25 -2
- package/internal/solidity/compiler/index.js.map +1 -1
- package/internal/util/fs-utils.d.ts +1 -1
- package/internal/util/fs-utils.js +1 -1
- package/internal/util/multi-process-mutex.d.ts +12 -0
- package/internal/util/multi-process-mutex.d.ts.map +1 -0
- package/internal/util/multi-process-mutex.js +116 -0
- package/internal/util/multi-process-mutex.js.map +1 -0
- package/internal/util/report-telemetry-consent.d.ts +2 -0
- package/internal/util/report-telemetry-consent.d.ts.map +1 -0
- package/internal/util/report-telemetry-consent.js +15 -0
- package/internal/util/report-telemetry-consent.js.map +1 -0
- package/package.json +2 -1
- package/src/builtin-tasks/compile.ts +20 -2
- package/src/internal/cli/analytics.ts +82 -6
- package/src/internal/cli/cli.ts +16 -9
- package/src/internal/cli/project-creation.ts +9 -19
- package/src/internal/cli/version-notifier.ts +268 -0
- package/src/internal/core/config/config-loading.ts +2 -1
- package/src/internal/core/config/config-resolution.ts +7 -1
- package/src/internal/core/config/config-validation.ts +9 -2
- package/src/internal/core/providers/gas-providers.ts +8 -0
- package/src/internal/hardhat-network/stack-traces/panic-errors.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +17 -1
- package/src/internal/sentry/transport.ts +1 -1
- package/src/internal/solidity/compiler/downloader.ts +2 -2
- package/src/internal/solidity/compiler/index.ts +22 -2
- package/src/internal/util/fs-utils.ts +1 -1
- package/src/internal/util/multi-process-mutex.ts +133 -0
- package/src/internal/util/report-telemetry-consent.ts +19 -0
|
@@ -237,7 +237,7 @@ class SolidityCallSite {
|
|
|
237
237
|
return 0;
|
|
238
238
|
}
|
|
239
239
|
getScriptNameOrSourceURL() {
|
|
240
|
-
return
|
|
240
|
+
return "";
|
|
241
241
|
}
|
|
242
242
|
getThis() {
|
|
243
243
|
return undefined;
|
|
@@ -263,5 +263,17 @@ class SolidityCallSite {
|
|
|
263
263
|
isToplevel() {
|
|
264
264
|
return false;
|
|
265
265
|
}
|
|
266
|
+
getScriptHash() {
|
|
267
|
+
return "";
|
|
268
|
+
}
|
|
269
|
+
getEnclosingColumnNumber() {
|
|
270
|
+
return 0;
|
|
271
|
+
}
|
|
272
|
+
getEnclosingLineNumber() {
|
|
273
|
+
return 0;
|
|
274
|
+
}
|
|
275
|
+
toString() {
|
|
276
|
+
return "[SolidityCallSite]";
|
|
277
|
+
}
|
|
266
278
|
}
|
|
267
279
|
//# sourceMappingURL=solidity-errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solidity-errors.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidity-errors.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"solidity-errors.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/solidity-errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloader.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAS/C,oBAAY,gBAAgB;IAC1B,KAAK,gBAAgB;IACrB,OAAO,kBAAkB;IACzB,KAAK,iBAAiB;IACtB,IAAI,SAAS;CACd;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAkBD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAExD;;;OAGG;IACH,gBAAgB,CACd,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,CAAC,oBAAoB,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,EAClE,eAAe,EAAE,CAAC,oBAAoB,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,YAAW,mBAAmB;IA8C1D,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB;WAhDtB,mBAAmB,IAAI,gBAAgB;IAmBrD,OAAO,CAAC,MAAM,CAAC,sBAAsB,CACzB;WAEE,4BAA4B,CACxC,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM;IActB,OAAc,8BAA8B,SAAY;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"downloader.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAS/C,oBAAY,gBAAgB;IAC1B,KAAK,gBAAgB;IACrB,OAAO,kBAAkB;IACzB,KAAK,iBAAiB;IACtB,IAAI,SAAS;CACd;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAkBD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAExD;;;OAGG;IACH,gBAAgB,CACd,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,CAAC,oBAAoB,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,EAClE,eAAe,EAAE,CAAC,oBAAoB,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,YAAW,mBAAmB;IA8C1D,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB;WAhDtB,mBAAmB,IAAI,gBAAgB;IAmBrD,OAAO,CAAC,MAAM,CAAC,sBAAsB,CACzB;WAEE,4BAA4B,CACxC,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM;IActB,OAAc,8BAA8B,SAAY;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8C;IAErE;;OAEG;gBAEgB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,EACrB,0BAA0B,SAAoD,EAC9E,iBAAiB,GAAE,OAAO,QAAmB;IAGnD,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYvD,gBAAgB,CAC3B,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,CAAC,oBAAoB,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,EAClE,eAAe,EAAE,CAAC,oBAAoB,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC;IA4DH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;YA2B1D,iBAAiB;IAY/B,OAAO,CAAC,oBAAoB;YAId,iBAAiB;IAI/B,OAAO,CAAC,iCAAiC;IAIzC,OAAO,CAAC,+BAA+B;IAavC,OAAO,CAAC,0BAA0B;YAIpB,2BAA2B;YAY3B,qBAAqB;YAQrB,iBAAiB;YAUjB,uBAAuB;YAoBvB,4BAA4B;YAqC5B,gBAAgB;CAW/B"}
|
|
@@ -36,7 +36,7 @@ const util_1 = require("util");
|
|
|
36
36
|
const download_1 = require("../../util/download");
|
|
37
37
|
const errors_1 = require("../../core/errors");
|
|
38
38
|
const errors_list_1 = require("../../core/errors-list");
|
|
39
|
-
const
|
|
39
|
+
const multi_process_mutex_1 = require("../../util/multi-process-mutex");
|
|
40
40
|
const log = (0, debug_1.default)("hardhat:core:solidity:downloader");
|
|
41
41
|
const COMPILER_REPOSITORY_URL = "https://binaries.soliditylang.org";
|
|
42
42
|
var CompilerPlatform;
|
|
@@ -90,7 +90,7 @@ class CompilerDownloader {
|
|
|
90
90
|
this._compilersDir = _compilersDir;
|
|
91
91
|
this._compilerListCachePeriodMs = _compilerListCachePeriodMs;
|
|
92
92
|
this._downloadFunction = _downloadFunction;
|
|
93
|
-
this._mutex = new
|
|
93
|
+
this._mutex = new multi_process_mutex_1.MultiProcessMutex("compiler-download");
|
|
94
94
|
}
|
|
95
95
|
async isCompilerDownloaded(version) {
|
|
96
96
|
const build = await this._getCompilerBuild(version);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,wDAA+B;AAC/B,kDAA0B;AAC1B,4CAAoB;AACpB,iDAAyC;AACzC,+BAAiC;AAEjC,kDAA+C;AAC/C,8CAAyE;AACzE,wDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,8 @@ export declare class Compiler implements ICompiler {
|
|
|
18
18
|
}
|
|
19
19
|
export declare class NativeCompiler implements ICompiler {
|
|
20
20
|
private _pathToSolc;
|
|
21
|
-
|
|
21
|
+
private _solcVersion?;
|
|
22
|
+
constructor(_pathToSolc: string, _solcVersion?: string | undefined);
|
|
22
23
|
compile(input: CompilerInput): Promise<any>;
|
|
23
24
|
}
|
|
24
25
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAI/D,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACxD;AAED,qBAAa,QAAS,YAAW,SAAS;IAG5B,OAAO,CAAC,aAAa;IAFjC,OAAO,CAAC,WAAW,CAAC,CAAM;gBAEN,aAAa,EAAE,MAAM;IAE5B,OAAO,CAAC,KAAK,EAAE,aAAa;IAO5B,OAAO;IAapB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CA0B7B;AAED,qBAAa,cAAe,YAAW,SAAS;IAClC,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,YAAY,CAAC;gBAA1C,WAAW,EAAE,MAAM,EAAU,YAAY,CAAC,oBAAQ;IAEzD,OAAO,CAAC,KAAK,EAAE,aAAa;CA2C1C"}
|
|
@@ -22,10 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
exports.NativeCompiler = exports.Compiler = void 0;
|
|
27
30
|
const child_process_1 = require("child_process");
|
|
28
31
|
const fs = __importStar(require("fs"));
|
|
32
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
33
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
34
|
+
const semver = __importStar(require("semver"));
|
|
29
35
|
const errors_1 = require("../../core/errors");
|
|
30
36
|
const errors_list_1 = require("../../core/errors-list");
|
|
31
37
|
class Compiler {
|
|
@@ -71,13 +77,30 @@ class Compiler {
|
|
|
71
77
|
}
|
|
72
78
|
exports.Compiler = Compiler;
|
|
73
79
|
class NativeCompiler {
|
|
74
|
-
constructor(_pathToSolc) {
|
|
80
|
+
constructor(_pathToSolc, _solcVersion) {
|
|
75
81
|
this._pathToSolc = _pathToSolc;
|
|
82
|
+
this._solcVersion = _solcVersion;
|
|
76
83
|
}
|
|
77
84
|
async compile(input) {
|
|
85
|
+
const args = ["--standard-json"];
|
|
86
|
+
// Logic to make sure that solc default import callback is not being used.
|
|
87
|
+
// If solcVersion is not defined or <= 0.6.8, do not add extra args.
|
|
88
|
+
if (this._solcVersion !== undefined) {
|
|
89
|
+
if (semver.gte(this._solcVersion, "0.8.22")) {
|
|
90
|
+
// version >= 0.8.22
|
|
91
|
+
args.push("--no-import-callback");
|
|
92
|
+
}
|
|
93
|
+
else if (semver.gte(this._solcVersion, "0.6.9")) {
|
|
94
|
+
// version >= 0.6.9
|
|
95
|
+
const tmpFolder = node_path_1.default.join(node_os_1.default.tmpdir(), "hardhat-solc");
|
|
96
|
+
fs.mkdirSync(tmpFolder, { recursive: true });
|
|
97
|
+
args.push(`--base-path`);
|
|
98
|
+
args.push(tmpFolder);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
78
101
|
const output = await new Promise((resolve, reject) => {
|
|
79
102
|
try {
|
|
80
|
-
const process = (0, child_process_1.execFile)(this._pathToSolc,
|
|
103
|
+
const process = (0, child_process_1.execFile)(this._pathToSolc, args, {
|
|
81
104
|
maxBuffer: 1024 * 1024 * 500,
|
|
82
105
|
}, (err, stdout) => {
|
|
83
106
|
if (err !== null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare function getRealPathSync(absolutePath: string): string;
|
|
|
24
24
|
*
|
|
25
25
|
* @param absolutePathToDir A directory. If it doesn't exist `[]` is returned.
|
|
26
26
|
* @param matches A function to filter files (not directories)
|
|
27
|
-
* @returns An
|
|
27
|
+
* @returns An array of absolute paths. Each file has its true case, except
|
|
28
28
|
* for the initial absolutePathToDir part, which preserves the given casing.
|
|
29
29
|
* No order is guaranteed.
|
|
30
30
|
*/
|
|
@@ -72,7 +72,7 @@ exports.getRealPathSync = getRealPathSync;
|
|
|
72
72
|
*
|
|
73
73
|
* @param absolutePathToDir A directory. If it doesn't exist `[]` is returned.
|
|
74
74
|
* @param matches A function to filter files (not directories)
|
|
75
|
-
* @returns An
|
|
75
|
+
* @returns An array of absolute paths. Each file has its true case, except
|
|
76
76
|
* for the initial absolutePathToDir part, which preserves the given casing.
|
|
77
77
|
* No order is guaranteed.
|
|
78
78
|
*/
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare class MultiProcessMutex {
|
|
2
|
+
private _mutexFilePath;
|
|
3
|
+
private _mutexLifespanInMs;
|
|
4
|
+
constructor(mutexName: string, maxMutexLifespanInMs?: number);
|
|
5
|
+
use<T>(f: () => Promise<T>): Promise<T>;
|
|
6
|
+
private _tryToAcquireMutex;
|
|
7
|
+
private _executeFunctionAndReleaseMutex;
|
|
8
|
+
private _isMutexFileTooOld;
|
|
9
|
+
private _deleteMutexFile;
|
|
10
|
+
private _waitMs;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=multi-process-mutex.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi-process-mutex.d.ts","sourceRoot":"","sources":["../../src/internal/util/multi-process-mutex.ts"],"names":[],"mappings":"AAoBA,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,kBAAkB,CAAS;gBAEvB,SAAS,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM;IAQ/C,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;YAuBtC,kBAAkB;YAelB,+BAA+B;IAuB7C,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,gBAAgB;YAcV,OAAO;CAKtB"}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MultiProcessMutex = void 0;
|
|
7
|
+
/* eslint-disable @nomicfoundation/hardhat-internal-rules/only-hardhat-error */
|
|
8
|
+
const debug_1 = __importDefault(require("debug"));
|
|
9
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
10
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
11
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
12
|
+
// Logic explanation: the fs.writeFile function, when used with the wx+ flag, performs an atomic operation to create a file.
|
|
13
|
+
// If multiple processes try to create the same file simultaneously, only one will succeed.
|
|
14
|
+
// This logic can be utilized to implement a mutex.
|
|
15
|
+
// ATTENTION: in the current implementation, there's still a risk of two processes running simultaneously.
|
|
16
|
+
// For example, if processA has locked the mutex and is running, processB will wait.
|
|
17
|
+
// During this wait, processB continuously checks the elapsed time since the mutex lock file was created.
|
|
18
|
+
// If an excessive amount of time has passed, processB will assume ownership of the mutex to avoid stale locks.
|
|
19
|
+
// However, there's a possibility that processB might take ownership because the mutex creation file is outdated, even though processA is still running
|
|
20
|
+
// For more info check the Nomic Notion page (internal link).
|
|
21
|
+
const log = (0, debug_1.default)("hardhat:util:multi-process-mutex");
|
|
22
|
+
const DEFAULT_MAX_MUTEX_LIFESPAN_IN_MS = 60000;
|
|
23
|
+
const MUTEX_LOOP_WAITING_TIME_IN_MS = 100;
|
|
24
|
+
class MultiProcessMutex {
|
|
25
|
+
constructor(mutexName, maxMutexLifespanInMs) {
|
|
26
|
+
log(`Creating mutex with name '${mutexName}'`);
|
|
27
|
+
this._mutexFilePath = node_path_1.default.join(node_os_1.default.tmpdir(), `${mutexName}.txt`);
|
|
28
|
+
this._mutexLifespanInMs =
|
|
29
|
+
maxMutexLifespanInMs ?? DEFAULT_MAX_MUTEX_LIFESPAN_IN_MS;
|
|
30
|
+
}
|
|
31
|
+
async use(f) {
|
|
32
|
+
log(`Starting mutex process with mutex file '${this._mutexFilePath}'`);
|
|
33
|
+
while (true) {
|
|
34
|
+
if (await this._tryToAcquireMutex()) {
|
|
35
|
+
// Mutex has been acquired
|
|
36
|
+
return this._executeFunctionAndReleaseMutex(f);
|
|
37
|
+
}
|
|
38
|
+
// Mutex not acquired
|
|
39
|
+
if (this._isMutexFileTooOld()) {
|
|
40
|
+
// If the mutex file is too old, it likely indicates a stale lock, so the file should be removed
|
|
41
|
+
log(`Current mutex file is too old, removing it at path '${this._mutexFilePath}'`);
|
|
42
|
+
this._deleteMutexFile();
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
// wait
|
|
46
|
+
await this._waitMs();
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
async _tryToAcquireMutex() {
|
|
51
|
+
try {
|
|
52
|
+
// Create a file only if it does not exist
|
|
53
|
+
node_fs_1.default.writeFileSync(this._mutexFilePath, "", { flag: "wx+" });
|
|
54
|
+
return true;
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
if (error.code === "EEXIST") {
|
|
58
|
+
// File already exists, so the mutex is already acquired
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
throw error;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
async _executeFunctionAndReleaseMutex(f) {
|
|
65
|
+
log(`Mutex acquired at path '${this._mutexFilePath}'`);
|
|
66
|
+
try {
|
|
67
|
+
const res = await f();
|
|
68
|
+
// Release the mutex
|
|
69
|
+
log(`Mutex released at path '${this._mutexFilePath}'`);
|
|
70
|
+
this._deleteMutexFile();
|
|
71
|
+
log(`Mutex released at path '${this._mutexFilePath}'`);
|
|
72
|
+
return res;
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
// Catch any error to avoid stale locks.
|
|
76
|
+
// Remove the mutex file and re-throw the error
|
|
77
|
+
this._deleteMutexFile();
|
|
78
|
+
throw error;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
_isMutexFileTooOld() {
|
|
82
|
+
let fileStat;
|
|
83
|
+
try {
|
|
84
|
+
fileStat = node_fs_1.default.statSync(this._mutexFilePath);
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
if (error.code === "ENOENT") {
|
|
88
|
+
// The file might have been deleted by another process while this function was trying to access it.
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
91
|
+
throw error;
|
|
92
|
+
}
|
|
93
|
+
const now = new Date();
|
|
94
|
+
const fileDate = new Date(fileStat.ctime);
|
|
95
|
+
const diff = now.getTime() - fileDate.getTime();
|
|
96
|
+
return diff > this._mutexLifespanInMs;
|
|
97
|
+
}
|
|
98
|
+
_deleteMutexFile() {
|
|
99
|
+
try {
|
|
100
|
+
log(`Deleting mutex file at path '${this._mutexFilePath}'`);
|
|
101
|
+
node_fs_1.default.unlinkSync(this._mutexFilePath);
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
if (error.code === "ENOENT") {
|
|
105
|
+
// The file might have been deleted by another process while this function was trying to access it.
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
throw error;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
async _waitMs() {
|
|
112
|
+
return new Promise((resolve) => setTimeout(resolve, MUTEX_LOOP_WAITING_TIME_IN_MS));
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
exports.MultiProcessMutex = MultiProcessMutex;
|
|
116
|
+
//# sourceMappingURL=multi-process-mutex.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi-process-mutex.js","sourceRoot":"","sources":["../../src/internal/util/multi-process-mutex.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"report-telemetry-consent.d.ts","sourceRoot":"","sources":["../../src/internal/util/report-telemetry-consent.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const analytics_1 = require("../cli/analytics");
|
|
4
|
+
async function main() {
|
|
5
|
+
// This default value shouldn't be necessary, but we add one to make it
|
|
6
|
+
// easier to recognize if the telemetry consent value is not passed.
|
|
7
|
+
const [telemetryConsent = "<undefined-telemetry-consent>"] = process.argv.slice(2);
|
|
8
|
+
// we pass undefined as the telemetryConsent value because
|
|
9
|
+
// this hit is done before the consent is saved
|
|
10
|
+
const analytics = await analytics_1.Analytics.getInstance(undefined);
|
|
11
|
+
const [_, consentHitPromise] = await analytics.sendTelemetryConsentHit(telemetryConsent);
|
|
12
|
+
await consentHitPromise;
|
|
13
|
+
}
|
|
14
|
+
main().catch(() => { });
|
|
15
|
+
//# sourceMappingURL=report-telemetry-consent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"report-telemetry-consent.js","sourceRoot":"","sources":["../../src/internal/util/report-telemetry-consent.ts"],"names":[],"mappings":";;AAAA,gDAA6C;AAE7C,KAAK,UAAU,IAAI;IACjB,uEAAuE;IACvE,oEAAoE;IACpE,MAAM,CAAC,gBAAgB,GAAG,+BAA+B,CAAC,GACxD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAExB,0DAA0D;IAC1D,+CAA+C;IAC/C,MAAM,SAAS,GAAG,MAAM,qBAAS,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEzD,MAAM,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,MAAM,SAAS,CAAC,uBAAuB,CACpE,gBAAgC,CACjC,CAAC;IACF,MAAM,iBAAiB,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hardhat",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.5",
|
|
4
4
|
"author": "Nomic Labs LLC",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://hardhat.org",
|
|
@@ -101,6 +101,7 @@
|
|
|
101
101
|
"adm-zip": "^0.4.16",
|
|
102
102
|
"aggregate-error": "^3.0.0",
|
|
103
103
|
"ansi-escapes": "^4.3.0",
|
|
104
|
+
"boxen": "^5.1.2",
|
|
104
105
|
"chalk": "^2.4.2",
|
|
105
106
|
"chokidar": "^3.4.0",
|
|
106
107
|
"ci-info": "^2.0.0",
|
|
@@ -674,9 +674,26 @@ subtask(TASK_COMPILE_SOLIDITY_RUN_SOLCJS)
|
|
|
674
674
|
subtask(TASK_COMPILE_SOLIDITY_RUN_SOLC)
|
|
675
675
|
.addParam("input", undefined, undefined, types.any)
|
|
676
676
|
.addParam("solcPath", undefined, undefined, types.string)
|
|
677
|
+
.addOptionalParam("solcVersion", undefined, undefined, types.string)
|
|
677
678
|
.setAction(
|
|
678
|
-
async ({
|
|
679
|
-
|
|
679
|
+
async ({
|
|
680
|
+
input,
|
|
681
|
+
solcPath,
|
|
682
|
+
solcVersion,
|
|
683
|
+
}: {
|
|
684
|
+
input: CompilerInput;
|
|
685
|
+
solcPath: string;
|
|
686
|
+
solcVersion?: string;
|
|
687
|
+
}) => {
|
|
688
|
+
if (solcVersion !== undefined && semver.valid(solcVersion) === null) {
|
|
689
|
+
throw new HardhatError(ERRORS.ARGUMENTS.INVALID_VALUE_FOR_TYPE, {
|
|
690
|
+
value: solcVersion,
|
|
691
|
+
name: "solcVersion",
|
|
692
|
+
type: "string",
|
|
693
|
+
});
|
|
694
|
+
}
|
|
695
|
+
|
|
696
|
+
const compiler = new NativeCompiler(solcPath, solcVersion);
|
|
680
697
|
|
|
681
698
|
return compiler.compile(input);
|
|
682
699
|
}
|
|
@@ -740,6 +757,7 @@ subtask(TASK_COMPILE_SOLIDITY_COMPILE_SOLC)
|
|
|
740
757
|
output = await run(TASK_COMPILE_SOLIDITY_RUN_SOLC, {
|
|
741
758
|
input,
|
|
742
759
|
solcPath: solcBuild.compilerPath,
|
|
760
|
+
solcVersion,
|
|
743
761
|
});
|
|
744
762
|
}
|
|
745
763
|
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { request as RequestT } from "undici";
|
|
2
2
|
|
|
3
3
|
import debug from "debug";
|
|
4
|
-
import os from "os";
|
|
4
|
+
import os from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import { spawn } from "node:child_process";
|
|
5
7
|
|
|
6
8
|
import { isLocalDev } from "../core/execution-mode";
|
|
7
9
|
import { isRunningOnCiServer } from "../util/ci-detection";
|
|
@@ -10,8 +12,10 @@ import {
|
|
|
10
12
|
readFirstLegacyAnalyticsId,
|
|
11
13
|
readSecondLegacyAnalyticsId,
|
|
12
14
|
writeAnalyticsId,
|
|
15
|
+
writeTelemetryConsent,
|
|
13
16
|
} from "../util/global-dir";
|
|
14
17
|
import { getPackageJson } from "../util/packageInfo";
|
|
18
|
+
import { confirmTelemetryConsent } from "./prompt";
|
|
15
19
|
|
|
16
20
|
const log = debug("hardhat:core:analytics");
|
|
17
21
|
|
|
@@ -19,6 +23,17 @@ const log = debug("hardhat:core:analytics");
|
|
|
19
23
|
interface AnalyticsPayload {
|
|
20
24
|
client_id: string;
|
|
21
25
|
user_id: string;
|
|
26
|
+
user_properties: {};
|
|
27
|
+
events: Array<{
|
|
28
|
+
name: string;
|
|
29
|
+
params: {
|
|
30
|
+
engagement_time_msec?: string;
|
|
31
|
+
session_id?: string;
|
|
32
|
+
};
|
|
33
|
+
}>;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
interface TaskHitPayload extends AnalyticsPayload {
|
|
22
37
|
user_properties: {
|
|
23
38
|
projectId: {
|
|
24
39
|
value?: string;
|
|
@@ -37,14 +52,26 @@ interface AnalyticsPayload {
|
|
|
37
52
|
};
|
|
38
53
|
};
|
|
39
54
|
events: Array<{
|
|
40
|
-
name:
|
|
55
|
+
name: "task";
|
|
56
|
+
params: {
|
|
57
|
+
engagement_time_msec?: string;
|
|
58
|
+
session_id?: string;
|
|
59
|
+
scope?: string;
|
|
60
|
+
task?: string;
|
|
61
|
+
};
|
|
62
|
+
}>;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
interface TelemetryConsentHitPayload extends AnalyticsPayload {
|
|
66
|
+
events: Array<{
|
|
67
|
+
name: "TelemetryConsentResponse";
|
|
41
68
|
params: {
|
|
42
|
-
engagement_time_msec
|
|
43
|
-
session_id
|
|
69
|
+
engagement_time_msec?: string;
|
|
70
|
+
session_id?: string;
|
|
71
|
+
userConsent: "yes" | "no";
|
|
44
72
|
};
|
|
45
73
|
}>;
|
|
46
74
|
}
|
|
47
|
-
/* eslint-enable @typescript-eslint/naming-convention */
|
|
48
75
|
|
|
49
76
|
type AbortAnalytics = () => void;
|
|
50
77
|
|
|
@@ -109,12 +136,31 @@ export class Analytics {
|
|
|
109
136
|
return this._sendHit(await this._buildTaskHitPayload(eventParams));
|
|
110
137
|
}
|
|
111
138
|
|
|
139
|
+
public async sendTelemetryConsentHit(
|
|
140
|
+
userConsent: "yes" | "no"
|
|
141
|
+
): Promise<[AbortAnalytics, Promise<void>]> {
|
|
142
|
+
const telemetryConsentHitPayload: TelemetryConsentHitPayload = {
|
|
143
|
+
client_id: "hardhat_telemetry_consent",
|
|
144
|
+
user_id: "hardhat_telemetry_consent",
|
|
145
|
+
user_properties: {},
|
|
146
|
+
events: [
|
|
147
|
+
{
|
|
148
|
+
name: "TelemetryConsentResponse",
|
|
149
|
+
params: {
|
|
150
|
+
userConsent,
|
|
151
|
+
},
|
|
152
|
+
},
|
|
153
|
+
],
|
|
154
|
+
};
|
|
155
|
+
return this._sendHit(telemetryConsentHitPayload);
|
|
156
|
+
}
|
|
157
|
+
|
|
112
158
|
private async _buildTaskHitPayload(
|
|
113
159
|
eventParams: {
|
|
114
160
|
scope?: string;
|
|
115
161
|
task?: string;
|
|
116
162
|
} = {}
|
|
117
|
-
): Promise<
|
|
163
|
+
): Promise<TaskHitPayload> {
|
|
118
164
|
return {
|
|
119
165
|
client_id: this._clientId,
|
|
120
166
|
user_id: this._clientId,
|
|
@@ -207,3 +253,33 @@ async function getHardhatVersion(): Promise<string> {
|
|
|
207
253
|
|
|
208
254
|
return `Hardhat ${version}`;
|
|
209
255
|
}
|
|
256
|
+
|
|
257
|
+
export async function requestTelemetryConsent() {
|
|
258
|
+
const telemetryConsent = await confirmTelemetryConsent();
|
|
259
|
+
|
|
260
|
+
if (telemetryConsent === undefined) {
|
|
261
|
+
return;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
writeTelemetryConsent(telemetryConsent);
|
|
265
|
+
|
|
266
|
+
const reportTelemetryConsentPath = join(
|
|
267
|
+
__dirname,
|
|
268
|
+
"..",
|
|
269
|
+
"util",
|
|
270
|
+
"report-telemetry-consent.js"
|
|
271
|
+
);
|
|
272
|
+
|
|
273
|
+
const subprocess = spawn(
|
|
274
|
+
process.execPath,
|
|
275
|
+
[reportTelemetryConsentPath, telemetryConsent ? "yes" : "no"],
|
|
276
|
+
{
|
|
277
|
+
detached: true,
|
|
278
|
+
stdio: "ignore",
|
|
279
|
+
}
|
|
280
|
+
);
|
|
281
|
+
|
|
282
|
+
subprocess.unref();
|
|
283
|
+
|
|
284
|
+
return telemetryConsent;
|
|
285
|
+
}
|