hardhat 2.18.3 → 2.19.1

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.
Files changed (77) hide show
  1. package/builtin-tasks/compile.js +13 -8
  2. package/builtin-tasks/compile.js.map +1 -1
  3. package/builtin-tasks/vars.d.ts +2 -0
  4. package/builtin-tasks/vars.d.ts.map +1 -0
  5. package/builtin-tasks/vars.js +41 -0
  6. package/builtin-tasks/vars.js.map +1 -0
  7. package/internal/cli/bootstrap.js +0 -0
  8. package/internal/cli/cli.js +4 -0
  9. package/internal/cli/cli.js.map +1 -1
  10. package/internal/cli/project-creation.js +6 -6
  11. package/internal/cli/vars.d.ts +2 -0
  12. package/internal/cli/vars.d.ts.map +1 -0
  13. package/internal/cli/vars.js +216 -0
  14. package/internal/cli/vars.js.map +1 -0
  15. package/internal/context.d.ts +4 -0
  16. package/internal/context.d.ts.map +1 -1
  17. package/internal/context.js +3 -0
  18. package/internal/context.js.map +1 -1
  19. package/internal/core/config/config-env.d.ts +34 -0
  20. package/internal/core/config/config-env.d.ts.map +1 -1
  21. package/internal/core/config/config-env.js +47 -1
  22. package/internal/core/config/config-env.js.map +1 -1
  23. package/internal/core/config/config-loading.d.ts +1 -0
  24. package/internal/core/config/config-loading.d.ts.map +1 -1
  25. package/internal/core/config/config-loading.js +8 -4
  26. package/internal/core/config/config-loading.js.map +1 -1
  27. package/internal/core/errors-list.d.ts +30 -0
  28. package/internal/core/errors-list.d.ts.map +1 -1
  29. package/internal/core/errors-list.js +36 -1
  30. package/internal/core/errors-list.js.map +1 -1
  31. package/internal/core/providers/gas-providers.d.ts.map +1 -1
  32. package/internal/core/providers/gas-providers.js +15 -1
  33. package/internal/core/providers/gas-providers.js.map +1 -1
  34. package/internal/core/tasks/builtin-tasks.d.ts +1 -0
  35. package/internal/core/tasks/builtin-tasks.d.ts.map +1 -1
  36. package/internal/core/tasks/builtin-tasks.js +1 -0
  37. package/internal/core/tasks/builtin-tasks.js.map +1 -1
  38. package/internal/core/vars/vars-manager-setup.d.ts +22 -0
  39. package/internal/core/vars/vars-manager-setup.d.ts.map +1 -0
  40. package/internal/core/vars/vars-manager-setup.js +95 -0
  41. package/internal/core/vars/vars-manager-setup.js.map +1 -0
  42. package/internal/core/vars/vars-manager.d.ts +21 -0
  43. package/internal/core/vars/vars-manager.d.ts.map +1 -0
  44. package/internal/core/vars/vars-manager.js +110 -0
  45. package/internal/core/vars/vars-manager.js.map +1 -0
  46. package/internal/hardhat-network/stack-traces/constants.d.ts +1 -1
  47. package/internal/hardhat-network/stack-traces/constants.js +1 -1
  48. package/internal/solidity/compiler/downloader.d.ts +2 -2
  49. package/internal/solidity/compiler/downloader.d.ts.map +1 -1
  50. package/internal/solidity/compiler/downloader.js +11 -1
  51. package/internal/solidity/compiler/downloader.js.map +1 -1
  52. package/internal/solidity/compiler/solc-info.d.ts.map +1 -1
  53. package/internal/solidity/compiler/solc-info.js +1 -0
  54. package/internal/solidity/compiler/solc-info.js.map +1 -1
  55. package/internal/util/global-dir.d.ts +1 -0
  56. package/internal/util/global-dir.d.ts.map +1 -1
  57. package/internal/util/global-dir.js +5 -1
  58. package/internal/util/global-dir.js.map +1 -1
  59. package/package.json +18 -19
  60. package/recommended-gitignore.txt +9 -6
  61. package/src/builtin-tasks/compile.ts +37 -36
  62. package/src/builtin-tasks/vars.ts +54 -0
  63. package/src/internal/cli/cli.ts +5 -1
  64. package/src/internal/cli/project-creation.ts +6 -6
  65. package/src/internal/cli/vars.ts +301 -0
  66. package/src/internal/context.ts +8 -0
  67. package/src/internal/core/config/config-env.ts +54 -0
  68. package/src/internal/core/config/config-loading.ts +16 -5
  69. package/src/internal/core/errors-list.ts +39 -1
  70. package/src/internal/core/providers/gas-providers.ts +20 -1
  71. package/src/internal/core/tasks/builtin-tasks.ts +1 -0
  72. package/src/internal/core/vars/vars-manager-setup.ts +124 -0
  73. package/src/internal/core/vars/vars-manager.ts +152 -0
  74. package/src/internal/hardhat-network/stack-traces/constants.ts +1 -1
  75. package/src/internal/solidity/compiler/downloader.ts +24 -2
  76. package/src/internal/solidity/compiler/solc-info.ts +1 -0
  77. package/src/internal/util/global-dir.ts +4 -0
@@ -0,0 +1,95 @@
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.VarsManagerSetup = void 0;
7
+ const debug_1 = __importDefault(require("debug"));
8
+ const vars_manager_1 = require("./vars-manager");
9
+ const log = (0, debug_1.default)("hardhat:core:vars:varsManagerSetup");
10
+ /**
11
+ * This class is ONLY used when collecting the required and optional vars that have to be filled by the user
12
+ */
13
+ class VarsManagerSetup extends vars_manager_1.VarsManager {
14
+ constructor(varsFilePath) {
15
+ log("Creating a new instance of VarsManagerSetup");
16
+ super(varsFilePath);
17
+ this._getVarsAlreadySet = new Set();
18
+ this._hasVarsAlreadySet = new Set();
19
+ this._getVarsWithDefaultValueAlreadySet = new Set();
20
+ this._getVarsToSet = new Set();
21
+ this._hasVarsToSet = new Set();
22
+ this._getVarsWithDefaultValueToSet = new Set();
23
+ }
24
+ // Checks if the key exists, and updates sets accordingly.
25
+ // Ignore the parameter 'includeEnvs' defined in the parent class because during setup env vars are ignored.
26
+ has(key) {
27
+ log(`function 'has' called with key '${key}'`);
28
+ const hasKey = super.has(key);
29
+ if (hasKey) {
30
+ this._hasVarsAlreadySet.add(key);
31
+ }
32
+ else {
33
+ this._hasVarsToSet.add(key);
34
+ }
35
+ return hasKey;
36
+ }
37
+ // Gets the value for the provided key, and updates sets accordingly.
38
+ // Ignore the parameter 'includeEnvs' defined in the parent class because during setup env vars are ignored.
39
+ get(key, defaultValue) {
40
+ log(`function 'get' called with key '${key}'`);
41
+ const varAlreadySet = super.has(key);
42
+ if (varAlreadySet) {
43
+ if (defaultValue !== undefined) {
44
+ this._getVarsWithDefaultValueAlreadySet.add(key);
45
+ }
46
+ else {
47
+ this._getVarsAlreadySet.add(key);
48
+ }
49
+ }
50
+ else {
51
+ if (defaultValue !== undefined) {
52
+ this._getVarsWithDefaultValueToSet.add(key);
53
+ }
54
+ else {
55
+ this._getVarsToSet.add(key);
56
+ }
57
+ }
58
+ // Do not return undefined to avoid throwing an error
59
+ return super.get(key, defaultValue) ?? "";
60
+ }
61
+ getRequiredVarsAlreadySet() {
62
+ return this._getRequired(this._getVarsAlreadySet, this._hasVarsAlreadySet);
63
+ }
64
+ getOptionalVarsAlreadySet() {
65
+ return this._getOptionals(this._getVarsAlreadySet, this._hasVarsAlreadySet, this._getVarsWithDefaultValueAlreadySet);
66
+ }
67
+ getRequiredVarsToSet() {
68
+ return this._getRequired(this._getVarsToSet, this._hasVarsToSet);
69
+ }
70
+ getOptionalVarsToSet() {
71
+ return this._getOptionals(this._getVarsToSet, this._hasVarsToSet, this._getVarsWithDefaultValueToSet);
72
+ }
73
+ // How to calculate required and optional variables:
74
+ //
75
+ // G = get function
76
+ // H = has function
77
+ // GD = get function with default value
78
+ //
79
+ // optional variables = H + (GD - G)
80
+ // required variables = G - H
81
+ _getRequired(getVars, hasVars) {
82
+ return Array.from(getVars).filter((k) => !hasVars.has(k));
83
+ }
84
+ _getOptionals(getVars, hasVars, getVarsWithDefault) {
85
+ const result = new Set(hasVars);
86
+ for (const k of getVarsWithDefault) {
87
+ if (!getVars.has(k)) {
88
+ result.add(k);
89
+ }
90
+ }
91
+ return Array.from(result);
92
+ }
93
+ }
94
+ exports.VarsManagerSetup = VarsManagerSetup;
95
+ //# sourceMappingURL=vars-manager-setup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vars-manager-setup.js","sourceRoot":"","sources":["../../../src/internal/core/vars/vars-manager-setup.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ export declare class VarsManager {
2
+ private readonly _varsFilePath;
3
+ private readonly _VERSION;
4
+ private readonly _ENV_VAR_PREFIX;
5
+ private readonly _storageCache;
6
+ private readonly _envCache;
7
+ constructor(_varsFilePath: string);
8
+ getStoragePath(): string;
9
+ set(key: string, value: string): void;
10
+ has(key: string, includeEnvs?: boolean): boolean;
11
+ get(key: string, defaultValue?: string, includeEnvs?: boolean): string | undefined;
12
+ getEnvVars(): string[];
13
+ list(): string[];
14
+ delete(key: string): boolean;
15
+ validateKey(key: string): void;
16
+ private _initializeVarsFile;
17
+ private _getVarsFileStructure;
18
+ private _loadVarsFromEnv;
19
+ private _writeStoredVars;
20
+ }
21
+ //# sourceMappingURL=vars-manager.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vars-manager.d.ts","sourceRoot":"","sources":["../../../src/internal/core/vars/vars-manager.ts"],"names":[],"mappings":"AAgBA,qBAAa,WAAW;IAMV,OAAO,CAAC,QAAQ,CAAC,aAAa;IAL1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAW;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyB;gBAEtB,aAAa,EAAE,MAAM;IAU3C,cAAc,IAAI,MAAM;IAIxB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAa9B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,GAAE,OAAe,GAAG,OAAO;IAQvD,GAAG,CACR,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,GAAE,OAAe,GAC3B,MAAM,GAAG,SAAS;IAQd,UAAU,IAAI,MAAM,EAAE;IAMtB,IAAI,IAAI,MAAM,EAAE;IAIhB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAW5B,WAAW,CAAC,GAAG,EAAE,MAAM;IAU9B,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,gBAAgB;CAKzB"}
@@ -0,0 +1,110 @@
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.VarsManager = void 0;
7
+ const fs_extra_1 = __importDefault(require("fs-extra"));
8
+ const debug_1 = __importDefault(require("debug"));
9
+ const errors_1 = require("../errors");
10
+ const errors_list_1 = require("../errors-list");
11
+ const log = (0, debug_1.default)("hardhat:core:vars:varsManager");
12
+ class VarsManager {
13
+ constructor(_varsFilePath) {
14
+ this._varsFilePath = _varsFilePath;
15
+ this._VERSION = "hh-vars-1";
16
+ this._ENV_VAR_PREFIX = "HARDHAT_VAR_";
17
+ log("Creating a new instance of VarsManager");
18
+ this._initializeVarsFile();
19
+ this._storageCache = fs_extra_1.default.readJSONSync(this._varsFilePath);
20
+ this._envCache = {};
21
+ this._loadVarsFromEnv();
22
+ }
23
+ getStoragePath() {
24
+ return this._varsFilePath;
25
+ }
26
+ set(key, value) {
27
+ this.validateKey(key);
28
+ if (value === "") {
29
+ throw new errors_1.HardhatError(errors_list_1.ERRORS.VARS.INVALID_EMPTY_VALUE);
30
+ }
31
+ const vars = this._storageCache.vars;
32
+ vars[key] = { value };
33
+ this._writeStoredVars(vars);
34
+ }
35
+ has(key, includeEnvs = false) {
36
+ if (includeEnvs && key in this._envCache) {
37
+ return true;
38
+ }
39
+ return key in this._storageCache.vars;
40
+ }
41
+ get(key, defaultValue, includeEnvs = false) {
42
+ if (includeEnvs && key in this._envCache) {
43
+ return this._envCache[key];
44
+ }
45
+ return this._storageCache.vars[key]?.value ?? defaultValue;
46
+ }
47
+ getEnvVars() {
48
+ return Object.keys(this._envCache).map((k) => `${this._ENV_VAR_PREFIX}${k}`);
49
+ }
50
+ list() {
51
+ return Object.keys(this._storageCache.vars);
52
+ }
53
+ delete(key) {
54
+ const vars = this._storageCache.vars;
55
+ if (vars[key] === undefined)
56
+ return false;
57
+ delete vars[key];
58
+ this._writeStoredVars(vars);
59
+ return true;
60
+ }
61
+ validateKey(key) {
62
+ const KEY_REGEX = /^[a-zA-Z_]+[a-zA-Z0-9_]*$/;
63
+ if (!KEY_REGEX.test(key)) {
64
+ throw new errors_1.HardhatError(errors_list_1.ERRORS.VARS.INVALID_CONFIG_VAR_NAME, {
65
+ value: key,
66
+ });
67
+ }
68
+ }
69
+ _initializeVarsFile() {
70
+ if (!fs_extra_1.default.pathExistsSync(this._varsFilePath)) {
71
+ // Initialize the vars file if it does not exist
72
+ log(`Vars file do not exist. Creating a new one at '${this._varsFilePath}' with version '${this._VERSION}'`);
73
+ fs_extra_1.default.writeJSONSync(this._varsFilePath, this._getVarsFileStructure(), {
74
+ spaces: 2,
75
+ });
76
+ }
77
+ }
78
+ _getVarsFileStructure() {
79
+ return {
80
+ _format: this._VERSION,
81
+ vars: {},
82
+ };
83
+ }
84
+ _loadVarsFromEnv() {
85
+ log("Loading ENV variables if any");
86
+ for (const key in process.env) {
87
+ if (key.startsWith(this._ENV_VAR_PREFIX)) {
88
+ const envVar = process.env[key];
89
+ if (envVar === undefined ||
90
+ envVar.replace(/[\s\t]/g, "").length === 0) {
91
+ throw new errors_1.HardhatError(errors_list_1.ERRORS.ARGUMENTS.INVALID_ENV_VAR_VALUE, {
92
+ varName: key,
93
+ value: envVar,
94
+ });
95
+ }
96
+ const envKey = key.replace(this._ENV_VAR_PREFIX, "");
97
+ this.validateKey(envKey);
98
+ // Store only in cache, not in a file, as the vars are sourced from environment variables
99
+ this._envCache[envKey] = envVar;
100
+ }
101
+ }
102
+ }
103
+ _writeStoredVars(vars) {
104
+ // ENV variables are not stored in the file
105
+ this._storageCache.vars = vars;
106
+ fs_extra_1.default.writeJSONSync(this._varsFilePath, this._storageCache, { spaces: 2 });
107
+ }
108
+ }
109
+ exports.VarsManager = VarsManager;
110
+ //# sourceMappingURL=vars-manager.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vars-manager.js","sourceRoot":"","sources":["../../../src/internal/core/vars/vars-manager.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- export declare const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.21";
1
+ export declare const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.22";
2
2
  export declare const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
3
3
  //# sourceMappingURL=constants.d.ts.map
@@ -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.21";
4
+ exports.SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.22";
5
5
  exports.FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
6
6
  //# sourceMappingURL=constants.js.map
@@ -26,7 +26,7 @@ export interface ICompilerDownloader {
26
26
  * Downloads the compiler for a given version, which can later be obtained
27
27
  * with getCompiler.
28
28
  */
29
- downloadCompiler(version: string): Promise<void>;
29
+ downloadCompiler(version: string, downloadStartedCb: (isCompilerDownloaded: boolean) => Promise<any>, downloadEndedCb: (isCompilerDownloaded: boolean) => Promise<any>): Promise<void>;
30
30
  /**
31
31
  * Returns the compiler, which MUST be downloaded before calling this function.
32
32
  *
@@ -61,7 +61,7 @@ export declare class CompilerDownloader implements ICompilerDownloader {
61
61
  */
62
62
  constructor(_platform: CompilerPlatform, _compilersDir: string, _compilerListCachePeriodMs?: number, _downloadFunction?: typeof download);
63
63
  isCompilerDownloaded(version: string): Promise<boolean>;
64
- downloadCompiler(version: string): Promise<void>;
64
+ downloadCompiler(version: string, downloadStartedCb: (isCompilerDownloaded: boolean) => Promise<any>, downloadEndedCb: (isCompilerDownloaded: boolean) => Promise<any>): Promise<void>;
65
65
  getCompiler(version: string): Promise<Compiler | undefined>;
66
66
  private _getCompilerBuild;
67
67
  private _getCompilerListPath;
@@ -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,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;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,CAAe;IAEtC;;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,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ChD,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"}
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,CAAe;IAEtC;;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"}
@@ -100,8 +100,17 @@ class CompilerDownloader {
100
100
  const downloadPath = this._getCompilerBinaryPathFromBuild(build);
101
101
  return fs_extra_1.default.pathExists(downloadPath);
102
102
  }
103
- async downloadCompiler(version) {
103
+ async downloadCompiler(version, downloadStartedCb, downloadEndedCb) {
104
+ // Since only one process at a time can acquire the mutex, we avoid the risk of downloading the same compiler multiple times.
105
+ // This is because the mutex blocks access until a compiler has been fully downloaded, preventing any new process
106
+ // from checking whether that version of the compiler exists. Without mutex it might incorrectly
107
+ // return false, indicating that the compiler isn't present, even though it is currently being downloaded.
104
108
  await this._mutex.use(async () => {
109
+ const isCompilerDownloaded = await this.isCompilerDownloaded(version);
110
+ if (isCompilerDownloaded === true) {
111
+ return;
112
+ }
113
+ await downloadStartedCb(isCompilerDownloaded);
105
114
  let build = await this._getCompilerBuild(version);
106
115
  if (build === undefined && (await this._shouldDownloadCompilerList())) {
107
116
  try {
@@ -131,6 +140,7 @@ class CompilerDownloader {
131
140
  });
132
141
  }
133
142
  await this._postProcessCompilerDownload(build, downloadPath);
143
+ await downloadEndedCb(isCompilerDownloaded);
134
144
  });
135
145
  }
136
146
  async getCompiler(version) {
@@ -1 +1 @@
1
- {"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":"AA8DA,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAEpB"}
1
+ {"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":"AA+DA,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAEpB"}
@@ -61,6 +61,7 @@ const defaultEvmTargets = {
61
61
  "0.8.19": "paris",
62
62
  "0.8.20": "shanghai",
63
63
  "0.8.21": "shanghai",
64
+ "0.8.22": "shanghai",
64
65
  };
65
66
  function getEvmVersionFromSolcVersion(solcVersion) {
66
67
  return defaultEvmTargets[solcVersion];
@@ -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;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;CACrB,CAAC;AAEF,SAAgB,4BAA4B,CAC1C,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC;AAJD,oEAIC"}
@@ -23,4 +23,5 @@ export declare function writeTelemetryConsent(consent: boolean): void;
23
23
  */
24
24
  export declare function hasPromptedForHHVSCode(): boolean;
25
25
  export declare function writePromptedForHHVSCode(): void;
26
+ export declare function getVarsFilePath(): string;
26
27
  //# sourceMappingURL=global-dir.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"global-dir.d.ts","sourceRoot":"","sources":["../../src/internal/util/global-dir.ts"],"names":[],"mappings":"AA+BA,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAInD;AAED,wBAAsB,eAAe,gCAIpC;AAED;;GAEG;AACH,wBAAgB,0BAA0B,gCAGzC;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,gCAIhD;AAgBD,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,iBAatD;AAED,wBAAsB,eAAe,oBAMpC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,GAAG,SAAS,CAY3D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,QAKrD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAOhD;AAED,wBAAgB,wBAAwB,SAKvC"}
1
+ {"version":3,"file":"global-dir.d.ts","sourceRoot":"","sources":["../../src/internal/util/global-dir.ts"],"names":[],"mappings":"AA+BA,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAInD;AAED,wBAAsB,eAAe,gCAIpC;AAED;;GAEG;AACH,wBAAgB,0BAA0B,gCAGzC;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,gCAIhD;AAgBD,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,iBAatD;AAED,wBAAsB,eAAe,oBAMpC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,GAAG,SAAS,CAY3D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,QAKrD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAOhD;AAED,wBAAgB,wBAAwB,SAKvC;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC"}
@@ -26,7 +26,7 @@ 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.writePromptedForHHVSCode = exports.hasPromptedForHHVSCode = exports.writeTelemetryConsent = exports.hasConsentedTelemetry = exports.getCompilersDir = exports.writeAnalyticsId = exports.readSecondLegacyAnalyticsId = exports.readFirstLegacyAnalyticsId = exports.readAnalyticsId = exports.getCacheDir = void 0;
29
+ exports.getVarsFilePath = exports.writePromptedForHHVSCode = exports.hasPromptedForHHVSCode = exports.writeTelemetryConsent = exports.hasConsentedTelemetry = exports.getCompilersDir = exports.writeAnalyticsId = exports.readSecondLegacyAnalyticsId = exports.readFirstLegacyAnalyticsId = exports.readAnalyticsId = exports.getCacheDir = void 0;
30
30
  const debug_1 = __importDefault(require("debug"));
31
31
  const fs_extra_1 = __importDefault(require("fs-extra"));
32
32
  const os_1 = __importDefault(require("os"));
@@ -150,4 +150,8 @@ function writePromptedForHHVSCode() {
150
150
  fs_extra_1.default.writeFileSync(extensionPromptedPath, "{}");
151
151
  }
152
152
  exports.writePromptedForHHVSCode = writePromptedForHHVSCode;
153
+ function getVarsFilePath() {
154
+ return path_1.default.join(getConfigDirSync(), "vars.json");
155
+ }
156
+ exports.getVarsFilePath = getVarsFilePath;
153
157
  //# sourceMappingURL=global-dir.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"global-dir.js","sourceRoot":"","sources":["../../src/internal/util/global-dir.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"global-dir.js","sourceRoot":"","sources":["../../src/internal/util/global-dir.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hardhat",
3
- "version": "2.18.3",
3
+ "version": "2.19.1",
4
4
  "author": "Nomic Labs LLC",
5
5
  "license": "MIT",
6
6
  "homepage": "https://hardhat.org",
@@ -22,20 +22,6 @@
22
22
  "bin": {
23
23
  "hardhat": "internal/cli/bootstrap.js"
24
24
  },
25
- "scripts": {
26
- "lint": "yarn prettier --check && yarn eslint",
27
- "lint:fix": "yarn prettier --write && yarn eslint --fix",
28
- "eslint": "eslint 'src/**/*.ts' 'test/**/*.ts'",
29
- "prettier": "prettier \"**/*.{js,md,json}\"",
30
- "pretest": "cd ../.. && yarn build",
31
- "test": "mocha --recursive \"test/**/*.ts\"",
32
- "test:except-tracing": "mocha --recursive \"test/**/*.ts\" --invert --grep \"Stack traces\"",
33
- "test:tracing": "mocha --recursive \"test/internal/hardhat-network/{helpers,stack-traces}/**/*.ts\"",
34
- "test:forking": "mocha --recursive \"test/internal/hardhat-network/{helpers,jsonrpc,provider}/**/*.ts\"",
35
- "build": "tsc --build .",
36
- "prepublishOnly": "yarn build",
37
- "clean": "rimraf builtin-tasks internal types utils *.d.ts *.map *.js build-test tsconfig.tsbuildinfo test/internal/hardhat-network/provider/.hardhat_node_test_cache test/internal/hardhat-network/stack-traces/test-files/artifacts"
38
- },
39
25
  "files": [
40
26
  "builtin-tasks/",
41
27
  "common/",
@@ -54,8 +40,6 @@
54
40
  "console.sol"
55
41
  ],
56
42
  "devDependencies": {
57
- "@nomicfoundation/eslint-plugin-hardhat-internal-rules": "^1.0.0",
58
- "@nomicfoundation/eslint-plugin-slow-imports": "^1.0.0",
59
43
  "@types/async-eventemitter": "^0.2.1",
60
44
  "@types/bn.js": "^5.1.0",
61
45
  "@types/chai": "^4.2.0",
@@ -93,7 +77,9 @@
93
77
  "sinon": "^9.0.0",
94
78
  "time-require": "^0.1.2",
95
79
  "ts-node": "^10.8.0",
96
- "typescript": "~5.0.0"
80
+ "typescript": "~5.0.0",
81
+ "@nomicfoundation/eslint-plugin-hardhat-internal-rules": "^1.0.2",
82
+ "@nomicfoundation/eslint-plugin-slow-imports": "^1.0.0"
97
83
  },
98
84
  "dependencies": {
99
85
  "@ethersproject/abi": "^5.1.2",
@@ -179,5 +165,18 @@
179
165
  "lcovonly"
180
166
  ],
181
167
  "all": true
168
+ },
169
+ "scripts": {
170
+ "lint": "pnpm prettier --check && pnpm eslint",
171
+ "lint:fix": "pnpm prettier --write && pnpm eslint --fix",
172
+ "eslint": "eslint 'src/**/*.ts' 'test/**/*.ts'",
173
+ "prettier": "prettier \"**/*.{js,md,json}\"",
174
+ "pretest": "cd ../.. && pnpm build",
175
+ "test": "mocha --recursive \"test/**/*.ts\"",
176
+ "test:except-tracing": "mocha --recursive \"test/**/*.ts\" --invert --grep \"Stack traces\"",
177
+ "test:tracing": "mocha --recursive \"test/internal/hardhat-network/{helpers,stack-traces}/**/*.ts\"",
178
+ "test:forking": "mocha --recursive \"test/internal/hardhat-network/{helpers,jsonrpc,provider}/**/*.ts\"",
179
+ "build": "tsc --build .",
180
+ "clean": "rimraf builtin-tasks internal types utils *.d.ts *.map *.js build-test tsconfig.tsbuildinfo test/internal/hardhat-network/provider/.hardhat_node_test_cache test/internal/hardhat-network/stack-traces/test-files/artifacts"
182
181
  }
183
- }
182
+ }
@@ -1,11 +1,14 @@
1
1
  node_modules
2
2
  .env
3
- coverage
4
- coverage.json
5
- typechain
6
- typechain-types
7
3
 
8
4
  # Hardhat files
9
- cache
10
- artifacts
5
+ /cache
6
+ /artifacts
11
7
 
8
+ # TypeChain files
9
+ /typechain
10
+ /typechain-types
11
+
12
+ # solidity-coverage files
13
+ /coverage
14
+ /coverage.json
@@ -580,26 +580,26 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD)
580
580
  compilersCache
581
581
  );
582
582
 
583
- const isCompilerDownloaded = await downloader.isCompilerDownloaded(
584
- solcVersion
583
+ await downloader.downloadCompiler(
584
+ solcVersion,
585
+ // callback called before compiler download
586
+ async (isCompilerDownloaded: boolean) => {
587
+ await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_START, {
588
+ solcVersion,
589
+ isCompilerDownloaded,
590
+ quiet,
591
+ });
592
+ },
593
+ // callback called after compiler download
594
+ async (isCompilerDownloaded: boolean) => {
595
+ await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_END, {
596
+ solcVersion,
597
+ isCompilerDownloaded,
598
+ quiet,
599
+ });
600
+ }
585
601
  );
586
602
 
587
- if (!isCompilerDownloaded) {
588
- await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_START, {
589
- solcVersion,
590
- isCompilerDownloaded,
591
- quiet,
592
- });
593
-
594
- await downloader.downloadCompiler(solcVersion);
595
-
596
- await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_END, {
597
- solcVersion,
598
- isCompilerDownloaded,
599
- quiet,
600
- });
601
- }
602
-
603
603
  const compiler = await downloader.getCompiler(solcVersion);
604
604
 
605
605
  if (compiler !== undefined) {
@@ -615,24 +615,25 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD)
615
615
  compilersCache
616
616
  );
617
617
 
618
- const isWasmCompilerDownloader =
619
- await wasmDownloader.isCompilerDownloaded(solcVersion);
620
-
621
- if (!isWasmCompilerDownloader) {
622
- await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_START, {
623
- solcVersion,
624
- isCompilerDownloaded,
625
- quiet,
626
- });
627
-
628
- await wasmDownloader.downloadCompiler(solcVersion);
629
-
630
- await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_END, {
631
- solcVersion,
632
- isCompilerDownloaded,
633
- quiet,
634
- });
635
- }
618
+ await wasmDownloader.downloadCompiler(
619
+ solcVersion,
620
+ async (isCompilerDownloaded: boolean) => {
621
+ // callback called before compiler download
622
+ await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_START, {
623
+ solcVersion,
624
+ isCompilerDownloaded,
625
+ quiet,
626
+ });
627
+ },
628
+ // callback called after compiler download
629
+ async (isCompilerDownloaded: boolean) => {
630
+ await run(TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_END, {
631
+ solcVersion,
632
+ isCompilerDownloaded,
633
+ quiet,
634
+ });
635
+ }
636
+ );
636
637
 
637
638
  const wasmCompiler = await wasmDownloader.getCompiler(solcVersion);
638
639