hardhat 2.19.0 → 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.
- package/builtin-tasks/compile.js +13 -8
- package/builtin-tasks/compile.js.map +1 -1
- package/internal/cli/bootstrap.js +0 -0
- package/internal/cli/project-creation.js +6 -6
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js +6 -3
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/providers/gas-providers.d.ts.map +1 -1
- package/internal/core/providers/gas-providers.js +15 -1
- package/internal/core/providers/gas-providers.js.map +1 -1
- package/internal/solidity/compiler/downloader.d.ts +2 -2
- package/internal/solidity/compiler/downloader.d.ts.map +1 -1
- package/internal/solidity/compiler/downloader.js +11 -1
- package/internal/solidity/compiler/downloader.js.map +1 -1
- package/package.json +18 -19
- package/recommended-gitignore.txt +9 -6
- package/src/builtin-tasks/compile.ts +37 -36
- package/src/internal/cli/cli.ts +0 -0
- package/src/internal/cli/project-creation.ts +6 -6
- package/src/internal/core/config/config-loading.ts +15 -4
- package/src/internal/core/providers/gas-providers.ts +20 -1
- package/src/internal/solidity/compiler/downloader.ts +24 -2
package/builtin-tasks/compile.js
CHANGED
|
@@ -333,40 +333,45 @@ const DEFAULT_CONCURRENCY_LEVEL = Math.max(os_1.default.cpus().length - 1, 1);
|
|
|
333
333
|
const compilersCache = await (0, global_dir_1.getCompilersDir)();
|
|
334
334
|
const compilerPlatform = downloader_1.CompilerDownloader.getCompilerPlatform();
|
|
335
335
|
const downloader = downloader_1.CompilerDownloader.getConcurrencySafeDownloader(compilerPlatform, compilersCache);
|
|
336
|
-
|
|
337
|
-
|
|
336
|
+
await downloader.downloadCompiler(solcVersion,
|
|
337
|
+
// callback called before compiler download
|
|
338
|
+
async (isCompilerDownloaded) => {
|
|
338
339
|
await run(task_names_1.TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_START, {
|
|
339
340
|
solcVersion,
|
|
340
341
|
isCompilerDownloaded,
|
|
341
342
|
quiet,
|
|
342
343
|
});
|
|
343
|
-
|
|
344
|
+
},
|
|
345
|
+
// callback called after compiler download
|
|
346
|
+
async (isCompilerDownloaded) => {
|
|
344
347
|
await run(task_names_1.TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_END, {
|
|
345
348
|
solcVersion,
|
|
346
349
|
isCompilerDownloaded,
|
|
347
350
|
quiet,
|
|
348
351
|
});
|
|
349
|
-
}
|
|
352
|
+
});
|
|
350
353
|
const compiler = await downloader.getCompiler(solcVersion);
|
|
351
354
|
if (compiler !== undefined) {
|
|
352
355
|
return compiler;
|
|
353
356
|
}
|
|
354
357
|
log("Native solc binary doesn't work, using solcjs instead. Try running npx hardhat clean --global");
|
|
355
358
|
const wasmDownloader = downloader_1.CompilerDownloader.getConcurrencySafeDownloader(downloader_1.CompilerPlatform.WASM, compilersCache);
|
|
356
|
-
|
|
357
|
-
|
|
359
|
+
await wasmDownloader.downloadCompiler(solcVersion, async (isCompilerDownloaded) => {
|
|
360
|
+
// callback called before compiler download
|
|
358
361
|
await run(task_names_1.TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_START, {
|
|
359
362
|
solcVersion,
|
|
360
363
|
isCompilerDownloaded,
|
|
361
364
|
quiet,
|
|
362
365
|
});
|
|
363
|
-
|
|
366
|
+
},
|
|
367
|
+
// callback called after compiler download
|
|
368
|
+
async (isCompilerDownloaded) => {
|
|
364
369
|
await run(task_names_1.TASK_COMPILE_SOLIDITY_LOG_DOWNLOAD_COMPILER_END, {
|
|
365
370
|
solcVersion,
|
|
366
371
|
isCompilerDownloaded,
|
|
367
372
|
quiet,
|
|
368
373
|
});
|
|
369
|
-
}
|
|
374
|
+
});
|
|
370
375
|
const wasmCompiler = await wasmDownloader.getCompiler(solcVersion);
|
|
371
376
|
(0, errors_1.assertHardhatInvariant)(wasmCompiler !== undefined, `WASM build of solc ${solcVersion} isn't working`);
|
|
372
377
|
return wasmCompiler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../src/builtin-tasks/compile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../src/builtin-tasks/compile.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -53,15 +53,15 @@ var Action;
|
|
|
53
53
|
const HARDHAT_PACKAGE_NAME = "hardhat";
|
|
54
54
|
const PROJECT_DEPENDENCIES = {};
|
|
55
55
|
const ETHERS_PROJECT_DEPENDENCIES = {
|
|
56
|
-
"@nomicfoundation/hardhat-toolbox": "^
|
|
56
|
+
"@nomicfoundation/hardhat-toolbox": "^4.0.0",
|
|
57
57
|
};
|
|
58
58
|
const VIEM_PROJECT_DEPENDENCIES = {
|
|
59
|
-
"@nomicfoundation/hardhat-toolbox-viem": "^
|
|
59
|
+
"@nomicfoundation/hardhat-toolbox-viem": "^2.0.0",
|
|
60
60
|
};
|
|
61
61
|
const PEER_DEPENDENCIES = {
|
|
62
62
|
hardhat: "^2.14.0",
|
|
63
63
|
"@nomicfoundation/hardhat-network-helpers": "^1.0.0",
|
|
64
|
-
"@nomicfoundation/hardhat-verify": "^
|
|
64
|
+
"@nomicfoundation/hardhat-verify": "^2.0.0",
|
|
65
65
|
chai: "^4.2.0",
|
|
66
66
|
"hardhat-gas-reporter": "^1.0.8",
|
|
67
67
|
"solidity-coverage": "^0.8.0",
|
|
@@ -70,9 +70,9 @@ const ETHERS_PEER_DEPENDENCIES = {
|
|
|
70
70
|
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
|
|
71
71
|
"@nomicfoundation/hardhat-ethers": "^3.0.0",
|
|
72
72
|
ethers: "^6.4.0",
|
|
73
|
-
"@typechain/hardhat": "^
|
|
74
|
-
typechain: "^8.
|
|
75
|
-
"@typechain/ethers-v6": "^0.
|
|
73
|
+
"@typechain/hardhat": "^9.0.0",
|
|
74
|
+
typechain: "^8.3.0",
|
|
75
|
+
"@typechain/ethers-v6": "^0.5.0",
|
|
76
76
|
};
|
|
77
77
|
const VIEM_PEER_DEPENDENCIES = {
|
|
78
78
|
"@nomicfoundation/hardhat-viem": "^1.0.0",
|
|
@@ -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,EACjB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAcxB,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAgBzD;AAED,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,
|
|
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;AAcxB,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAgBzD;AAED,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,QAmExE;AA6GD,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,aAAa,CAAC,UAAU,CAAC,GACxC,UAAU,EAAE,CAId"}
|
|
@@ -159,7 +159,7 @@ function analyzeModuleNotFoundError(error, configPath) {
|
|
|
159
159
|
}
|
|
160
160
|
const missingPeerDependencies = {};
|
|
161
161
|
for (const [peerDependency, version] of Object.entries(peerDependencies)) {
|
|
162
|
-
const peerDependencyPackageJson = readPackageJson(peerDependency);
|
|
162
|
+
const peerDependencyPackageJson = readPackageJson(peerDependency, configPath);
|
|
163
163
|
if (peerDependencyPackageJson === undefined) {
|
|
164
164
|
missingPeerDependencies[peerDependency] = version;
|
|
165
165
|
}
|
|
@@ -176,9 +176,12 @@ function analyzeModuleNotFoundError(error, configPath) {
|
|
|
176
176
|
}
|
|
177
177
|
}
|
|
178
178
|
exports.analyzeModuleNotFoundError = analyzeModuleNotFoundError;
|
|
179
|
-
function readPackageJson(packageName) {
|
|
179
|
+
function readPackageJson(packageName, configPath) {
|
|
180
|
+
const resolve = require("resolve");
|
|
180
181
|
try {
|
|
181
|
-
const packageJsonPath =
|
|
182
|
+
const packageJsonPath = resolve.sync(path_1.default.join(packageName, "package.json"), {
|
|
183
|
+
basedir: path_1.default.dirname(configPath),
|
|
184
|
+
});
|
|
182
185
|
return require(packageJsonPath);
|
|
183
186
|
}
|
|
184
187
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loading.js","sourceRoot":"","sources":["../../../src/internal/core/config/config-loading.ts"],"names":[],"mappings":"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
|
|
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;AAQ5B,2CAA+C;AAC/C,wDAAgE;AAChE,sCAAyC;AACzC,gDAAwC;AACxC,4DAAyD;AAEzD,4EAAgG;AAChG,2DAAoD;AACpD,2DAA6E;AAC7E,qDAAwD;AAExD,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,qBAAqB,CAAC,CAAC;AAEzC,SAAgB,mBAAmB,CAAC,QAAgB;IAClD,IAAI;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,QAAQ,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;KACrE;IAAC,OAAO,CAAM,EAAE;QACf,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,EAAE;YAChC,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,OAAO,CAAC,8BAA8B,EAC7C,EAAE,EACF,CAAC,CACF,CAAC;SACH;QAED,sFAAsF;QACtF,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAhBD,kDAgBC;AAED,SAAgB,iBAAiB,CAAC,UAA8B;IAC9D,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,UAAU,GAAG,IAAA,qCAAiB,GAAE,CAAC;KAClC;SAAM;QACL,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAChC,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;YAClD,UAAU,GAAG,cAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;SACzC;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAVD,8CAUC;AAED,SAAgB,kBAAkB,CAChC,gBAA4C,EAC5C,EACE,sBAAsB,GAAG,KAAK,EAC9B,0BAA0B,GAAG,KAAK,MAIhC;IACF,sBAAsB,EAAE,KAAK;IAC7B,0BAA0B,EAAE,KAAK;CAClC;IAED,IAAI,UAAU,GACZ,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAEvE,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC3C,GAAG,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC;IACjD,4EAA4E;IAC5E,uCAAuC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAE1C,MAAM,WAAW,GAAQ,MAAM,CAAC;IAEhC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAC/B,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAC7C,CAAC;IAEF,MAAM,GAAG,GAAG,wBAAc,CAAC,iBAAiB,EAAE,CAAC;IAE/C,GAAG,CAAC,yBAAyB,EAAE,CAAC;IAEhC,IAAI,UAAU,CAAC;IAEf,IAAI;QACF,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAClC,UAAU,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACV,0BAA0B,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAE1C,sFAAsF;QACtF,MAAM,CAAC,CAAC;KACT;YAAS;QACR,GAAG,CAAC,0BAA0B,EAAE,CAAC;KAClC;IAED,IAAI,sBAAsB,EAAE;QAC1B,gBAAgB,CAAC,UAAU,EAAE,EAAE,0BAA0B,EAAE,CAAC,CAAC;KAC9D;IAED,IAAA,kCAAc,EAAC,UAAU,CAAC,CAAC;IAE3B,IAAI,0BAA0B,EAAE;QAC9B,0BAA0B,CAAC,UAAU,CAAC,CAAC;KACxC;IAED,iEAAiE;IACjE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAExE,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAE1D,MAAM,QAAQ,GAAG,IAAA,iCAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvD,KAAK,MAAM,QAAQ,IAAI,wBAAc,CAAC,iBAAiB,EAAE,CAAC,eAAe,EAAE;QACzE,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;KACtC;IAED,IAAA,0CAAsB,EAAC,QAAQ,CAAC,CAAC;IAEjC,IAAI,0BAA0B,EAAE;QAC9B,8BAA8B,CAAC,QAAQ,CAAC,CAAC;QACzC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;KACtC;IAED,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC;AACpE,CAAC;AA3ED,gDA2EC;AAED,SAAS,oBAAoB,CAC3B,MAAW,EACX,eAAgD,EAAE;IAElD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE;QACjD,OAAO,MAAM,CAAC;KACf;IAED,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACvB,GAAG,CAAC,MAAW,EAAE,QAAkC,EAAE,QAAa;YAChE,OAAO,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACnE,GAAG,YAAY;gBACf,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QAED,GAAG,CACD,MAAW,EACX,QAAkC,EAClC,MAAW,EACX,SAAc;YAEd,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE;gBAC1D,IAAI,EAAE,CAAC,GAAG,YAAY,EAAE,QAAQ,CAAC;qBAC9B,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;qBACtC,IAAI,CAAC,GAAG,CAAC;aACb,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,0BAA0B,CAAC,KAAU,EAAE,UAAkB;IACvE,MAAM,gBAAgB,GACpB,OAAO,CAAC,mBAAmB,CAA6B,CAAC;IAE3D,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE;QACrC,OAAO;KACR;IACD,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,UAAU;SAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAK,CAAC;QACpB,8CAA8C;SAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC,CAAC;SACzE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnC,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,EAAE;QACvD,OAAO;KACR;IAED,6EAA6E;IAC7E,iCAAiC;IACjC,IAAI,YAAY,KAAK,UAAU,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,eAAe,GAAG,IAAA,oCAAsB,EAAC,YAAY,CAAC,CAAC;IAE7D,IAAI,eAAe,KAAK,IAAI,EAAE;QAC5B,OAAO;KACR;IAED,MAAM,WAAW,GAAG,kBAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GACpB,WAAW,CAAC,gBAAgB,IAAI,EAAE,CAAC;IAErC,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,KAAK,SAAS,EAAE;QACxD,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,OAAO,CAAC,cAAc,EAAE;YACpD,MAAM,EAAE,WAAW,CAAC,IAAI;SACzB,CAAC,CAAC;KACJ;IAED,kEAAkE;IAClE,IAAI,gBAAgB,CAAC,OAAO,KAAK,SAAS,EAAE;QAC1C,OAAO;KACR;IAED,MAAM,uBAAuB,GAA+B,EAAE,CAAC;IAC/D,KAAK,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QACxE,MAAM,yBAAyB,GAAG,eAAe,CAC/C,cAAc,EACd,UAAU,CACX,CAAC;QACF,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,uBAAuB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;SACnD;KACF;IAED,MAAM,4BAA4B,GAAG,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC1E,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3C,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE;YAC1D,MAAM,EAAE,WAAW,CAAC,IAAI;YACxB,mBAAmB,EAAE,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5D,2BAA2B,EAAE,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC;iBACjE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,OAAO,GAAG,CAAC;iBAChD,IAAI,CAAC,GAAG,CAAC;SACb,CAAC,CAAC;KACJ;AACH,CAAC;AAnED,gEAmEC;AAUD,SAAS,eAAe,CACtB,WAAmB,EACnB,UAAkB;IAElB,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;IAE/D,IAAI;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAClC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EACtC;YACE,OAAO,EAAE,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC;SAClC,CACF,CAAC;QAEF,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC;KACjC;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,UAAe,EACf,EAAE,0BAA0B,EAA2C;IAEvE,IAAI,UAAU,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpE,IAAI,OAAO,GAAG,oHAAoH,CAAC;QAEnI,4EAA4E;QAC5E,iDAAiD;QACjD,IAAI,CAAC,0BAA0B,EAAE;YAC/B,OAAO,IAAI,wEAAwE,CAAC;SACrF;QAED,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;KACrC;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,UAAe;IACjD,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE;QACrC,OAAO,CAAC,IAAI,CACV,eAAK,CAAC,MAAM,CACV,gDAAgD,qCAAoB;;;CAG3E,CACM,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,8BAA8B,CAAC,cAA6B;IACnE,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE/D,MAAM,mBAAmB,GAAa,EAAE,CAAC;IACzC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,IACE,CAAC,gBAAM,CAAC,SAAS,CAAC,WAAW,EAAE,4CAAgC,CAAC;YAChE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAC1C;YACA,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACvC;KACF;IAED,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QAClC,OAAO,CAAC,IAAI,CACV,eAAK,CAAC,MAAM,CACV,YAAY,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IACxC,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAC5C;;;CAGP,CACM,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,EAAE,QAAQ,EAAiB;IAC7D,MAAM,WAAW,GAAG;QAClB,GAAG,QAAQ,CAAC,SAAS;QACrB,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;KACrC,CAAC;IACF,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CACnC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS,CACpD,CAAC;IAEF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,OAAO,CAAC,IAAI,CACV,eAAK,CAAC,MAAM,CACV;;;CAGP,CACM,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,sBAAsB,CACpC,cAAyC;IAEzC,MAAM,gBAAgB,GAAG,cAAc,CAAC,SAAS,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,gBAAgB,CAAC,CAAC;AACpD,CAAC;AAND,wDAMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gas-providers.d.ts","sourceRoot":"","sources":["../../../src/internal/core/providers/gas-providers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOnE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,qBAAa,gBAAiB,SAAQ,eAAe;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAArD,QAAQ,EAAE,eAAe,EAAmB,SAAS,EAAE,MAAM;IAI5D,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAa/D;AAED,qBAAa,qBAAsB,SAAQ,eAAe;IACjB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAArD,QAAQ,EAAE,eAAe,EAAmB,SAAS,EAAE,MAAM;IAI5D,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAmB/D;AAED,uBAAe,+BAAgC,SAAQ,eAAe;IAKlE,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJjC,OAAO,CAAC,cAAc,CAAqB;gBAGzC,QAAQ,EAAE,eAAe,EACR,cAAc,EAAE,MAAM;cAKzB,2BAA2B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;YA+B7D,iBAAiB;CAehC;AAED,qBAAa,oBAAqB,SAAQ,+BAA+B;gBAErE,QAAQ,EAAE,eAAe,EACzB,aAAa,GAAE,MAA+B;IAKnC,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAa/D;AAED,qBAAa,yBAA0B,SAAQ,eAAe;IAG5D,gBAAuB,2CAA2C,EAAE,MAAM,CACrE;IAGL,gBAAuB,yBAAyB,MAAM;IAEtD,OAAO,CAAC,kBAAkB,CAAC,CAAU;IACrC,OAAO,CAAC,oBAAoB,CAAC,CAAU;IAE1B,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;YAiEhD,YAAY;YAQZ,6BAA6B;
|
|
1
|
+
{"version":3,"file":"gas-providers.d.ts","sourceRoot":"","sources":["../../../src/internal/core/providers/gas-providers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOnE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,qBAAa,gBAAiB,SAAQ,eAAe;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAArD,QAAQ,EAAE,eAAe,EAAmB,SAAS,EAAE,MAAM;IAI5D,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAa/D;AAED,qBAAa,qBAAsB,SAAQ,eAAe;IACjB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAArD,QAAQ,EAAE,eAAe,EAAmB,SAAS,EAAE,MAAM;IAI5D,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAmB/D;AAED,uBAAe,+BAAgC,SAAQ,eAAe;IAKlE,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJjC,OAAO,CAAC,cAAc,CAAqB;gBAGzC,QAAQ,EAAE,eAAe,EACR,cAAc,EAAE,MAAM;cAKzB,2BAA2B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;YA+B7D,iBAAiB;CAehC;AAED,qBAAa,oBAAqB,SAAQ,+BAA+B;gBAErE,QAAQ,EAAE,eAAe,EACzB,aAAa,GAAE,MAA+B;IAKnC,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAa/D;AAED,qBAAa,yBAA0B,SAAQ,eAAe;IAG5D,gBAAuB,2CAA2C,EAAE,MAAM,CACrE;IAGL,gBAAuB,yBAAyB,MAAM;IAEtD,OAAO,CAAC,kBAAkB,CAAC,CAAU;IACrC,OAAO,CAAC,oBAAoB,CAAC,CAAU;IAE1B,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;YAiEhD,YAAY;YAQZ,6BAA6B;CA0E5C"}
|
|
@@ -178,6 +178,20 @@ class AutomaticGasPriceProvider extends wrapper_1.ProviderWrapper {
|
|
|
178
178
|
[AutomaticGasPriceProvider.EIP1559_REWARD_PERCENTILE],
|
|
179
179
|
],
|
|
180
180
|
}));
|
|
181
|
+
let maxPriorityFeePerGas = (0, base_types_1.rpcQuantityToBigInt)(response.reward[0][0]);
|
|
182
|
+
if (maxPriorityFeePerGas === 0n) {
|
|
183
|
+
try {
|
|
184
|
+
const suggestedMaxPriorityFeePerGas = (await this._wrappedProvider.request({
|
|
185
|
+
method: "eth_maxPriorityFeePerGas",
|
|
186
|
+
params: [],
|
|
187
|
+
}));
|
|
188
|
+
maxPriorityFeePerGas = (0, base_types_1.rpcQuantityToBigInt)(suggestedMaxPriorityFeePerGas);
|
|
189
|
+
}
|
|
190
|
+
catch {
|
|
191
|
+
// if eth_maxPriorityFeePerGas does not exist, use 1 wei
|
|
192
|
+
maxPriorityFeePerGas = 1n;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
181
195
|
return {
|
|
182
196
|
// Each block increases the base fee by 1/8 at most, when full.
|
|
183
197
|
// We have the next block's base fee, so we compute a cap for the
|
|
@@ -189,7 +203,7 @@ class AutomaticGasPriceProvider extends wrapper_1.ProviderWrapper {
|
|
|
189
203
|
8n **
|
|
190
204
|
(AutomaticGasPriceProvider.EIP1559_BASE_FEE_MAX_FULL_BLOCKS_PREFERENCE -
|
|
191
205
|
1n),
|
|
192
|
-
maxPriorityFeePerGas
|
|
206
|
+
maxPriorityFeePerGas,
|
|
193
207
|
};
|
|
194
208
|
}
|
|
195
209
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gas-providers.js","sourceRoot":"","sources":["../../../src/internal/core/providers/gas-providers.ts"],"names":[],"mappings":";;;AACA,4DAIqC;AAErC,uCAA4C;AAE5C,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAEjC,MAAa,gBAAiB,SAAQ,yBAAe;IACnD,YAAY,QAAyB,EAAmB,SAAiB;QACvE,KAAK,CAAC,QAAQ,CAAC,CAAC;QADsC,cAAS,GAAT,SAAS,CAAQ;IAEzE,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAsB;QACzC,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAqB,EAAE;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAErC,sCAAsC;YACtC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,CAAC,GAAG,KAAK,SAAS,EAAE;gBAC5C,EAAE,CAAC,GAAG,GAAG,IAAA,gCAAmB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC9C;SACF;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAlBD,4CAkBC;AAED,MAAa,qBAAsB,SAAQ,yBAAe;IACxD,YAAY,QAAyB,EAAmB,SAAiB;QACvE,KAAK,CAAC,QAAQ,CAAC,CAAC;QADsC,cAAS,GAAT,SAAS,CAAQ;IAEzE,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAsB;QACzC,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAqB,EAAE;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAErC,sCAAsC;YACtC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACrB,sCAAsC;YACtC,IACE,EAAE,KAAK,SAAS;gBAChB,EAAE,CAAC,QAAQ,KAAK,SAAS;gBACzB,EAAE,CAAC,YAAY,KAAK,SAAS;gBAC7B,EAAE,CAAC,oBAAoB,KAAK,SAAS,EACrC;gBACA,EAAE,CAAC,QAAQ,GAAG,IAAA,gCAAmB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACnD;SACF;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAxBD,sDAwBC;AAED,MAAe,+BAAgC,SAAQ,yBAAe;IAGpE,YACE,QAAyB,EACR,cAAsB;QAEvC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAFC,mBAAc,GAAd,cAAc,CAAQ;IAGzC,CAAC;IAES,KAAK,CAAC,2BAA2B,CAAC,MAAa;QACvD,IAAI;YACF,MAAM,cAAc,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBAC1D,MAAM,EAAE,iBAAiB;gBACzB,MAAM;aACP,CAAC,CAAW,CAAC;YAEd,IAAI,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;gBAC7B,OAAO,cAAc,CAAC;aACvB;YAED,MAAM,SAAS,GAAG,IAAA,gCAAmB,EAAC,cAAc,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAEhD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/D,MAAM,GAAG,GAAG,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAE9D,OAAO,IAAA,gCAAmB,EAAC,GAAG,CAAC,CAAC;SACjC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,EAAE;gBAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;oBAC3D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACrD,OAAO,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;iBAC3C;aACF;YAED,sFAAsF;YACtF,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC7B,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE;YACrC,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACvD,MAAM,EAAE,sBAAsB;gBAC9B,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;aAC1B,CAAC,CAAyB,CAAC;YAE5B,MAAM,eAAe,GAAG,IAAA,gCAAmB,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAElE,+DAA+D;YAC/D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;SAC1D;QAED,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;CACF;AAED,MAAa,oBAAqB,SAAQ,+BAA+B;IACvE,YACE,QAAyB,EACzB,gBAAwB,sBAAsB;QAE9C,KAAK,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAsB;QACzC,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAqB,EAAE;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAErC,sCAAsC;YACtC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,CAAC,GAAG,KAAK,SAAS,EAAE;gBAC5C,EAAE,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;aACzD;SACF;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AArBD,oDAqBC;AAED,MAAa,yBAA0B,SAAQ,yBAAe;IAYrD,KAAK,CAAC,OAAO,CAAC,IAAsB;QACzC,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAqB,EAAE;YACzC,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5C;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAErC,sCAAsC;QACtC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAErB,IAAI,EAAE,KAAK,SAAS,EAAE;YACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5C;QAED,8CAA8C;QAC9C,IACE,EAAE,CAAC,QAAQ,KAAK,SAAS;YACzB,CAAC,EAAE,CAAC,YAAY,KAAK,SAAS,IAAI,EAAE,CAAC,oBAAoB,KAAK,SAAS,CAAC,EACxE;YACA,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5C;QAED,IAAI,sBAAsB,GAAG,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAExE,iDAAiD;QACjD,IACE,EAAE,CAAC,YAAY,KAAK,SAAS;YAC7B,EAAE,CAAC,oBAAoB,KAAK,SAAS;YACrC,sBAAsB,KAAK,SAAS,EACpC;YACA,EAAE,CAAC,QAAQ,GAAG,IAAA,gCAAmB,EAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5C;QAED,4EAA4E;QAC5E,yCAAyC;QACzC,IAAI,sBAAsB,KAAK,SAAS,EAAE;YACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAE3C,sBAAsB,GAAG;gBACvB,YAAY,EAAE,QAAQ;gBACtB,oBAAoB,EAAE,QAAQ;aAC/B,CAAC;SACH;QAED,IAAI,YAAY,GACd,EAAE,CAAC,YAAY,KAAK,SAAS;YAC3B,CAAC,CAAC,IAAA,gCAAmB,EAAC,EAAE,CAAC,YAAY,CAAC;YACtC,CAAC,CAAC,sBAAsB,CAAC,YAAY,CAAC;QAE1C,MAAM,oBAAoB,GACxB,EAAE,CAAC,oBAAoB,KAAK,SAAS;YACnC,CAAC,CAAC,IAAA,gCAAmB,EAAC,EAAE,CAAC,oBAAoB,CAAC;YAC9C,CAAC,CAAC,sBAAsB,CAAC,oBAAoB,CAAC;QAElD,IAAI,YAAY,GAAG,oBAAoB,EAAE;YACvC,YAAY,IAAI,oBAAoB,CAAC;SACtC;QAED,EAAE,CAAC,YAAY,GAAG,IAAA,gCAAmB,EAAC,YAAY,CAAC,CAAC;QACpD,EAAE,CAAC,oBAAoB,GAAG,IAAA,gCAAmB,EAAC,oBAAoB,CAAC,CAAC;QAEpE,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACpD,MAAM,EAAE,cAAc;SACvB,CAAC,CAAW,CAAC;QAEd,OAAO,IAAA,gCAAmB,EAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,6BAA6B;QAOzC,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACjD,MAAM,EAAE,sBAAsB;gBAC9B,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;aAC1B,CAAC,CAAQ,CAAC;YAEX,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC;SAC/D;QAED,IACE,IAAI,CAAC,kBAAkB,KAAK,KAAK;YACjC,IAAI,CAAC,oBAAoB,KAAK,KAAK,EACnC;YACA,OAAO;SACR;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACpD,MAAM,EAAE,gBAAgB;gBACxB,MAAM,EAAE;oBACN,KAAK;oBACL,QAAQ;oBACR,CAAC,yBAAyB,CAAC,yBAAyB,CAAC;iBACtD;aACF,CAAC,CAAoD,CAAC;YAEvD,OAAO;gBACL,+DAA+D;gBAC/D,iEAAiE;gBACjE,sBAAsB;gBAEtB,YAAY,EACV,CAAC,IAAA,gCAAmB,EAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;oBAC7C,EAAE;wBACA,CAAC,yBAAyB,CAAC,2CAA2C;4BACpE,EAAE,CAAC,CAAC;oBACV,EAAE;wBACA,CAAC,yBAAyB,CAAC,2CAA2C;4BACpE,EAAE,CAAC;gBAET,oBAAoB
|
|
1
|
+
{"version":3,"file":"gas-providers.js","sourceRoot":"","sources":["../../../src/internal/core/providers/gas-providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,wDAA+B;AAC/B,kDAA0B;AAC1B,4CAAoB;AACpB,iDAAyC;AACzC,+BAAiC;AAEjC,kDAA+C;AAC/C,8CAAyE;AACzE,wDAAgD;AAChD,kEAAqD;AAErD,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,kCAAkC,CAAC,CAAC;AAEtD,MAAM,uBAAuB,GAAG,mCAAmC,CAAC;AAEpE,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,yCAAqB,CAAA;IACrB,6CAAyB,CAAA;IACzB,0CAAsB,CAAA;IACtB,iCAAa,CAAA;AACf,CAAC,EALW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAK3B;
|
|
1
|
+
{"version":3,"file":"downloader.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/downloader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hardhat",
|
|
3
|
-
"version": "2.19.
|
|
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
|
-
|
|
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
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
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
|
|
package/src/internal/cli/cli.ts
CHANGED
|
File without changes
|
|
@@ -45,17 +45,17 @@ const HARDHAT_PACKAGE_NAME = "hardhat";
|
|
|
45
45
|
const PROJECT_DEPENDENCIES: Dependencies = {};
|
|
46
46
|
|
|
47
47
|
const ETHERS_PROJECT_DEPENDENCIES: Dependencies = {
|
|
48
|
-
"@nomicfoundation/hardhat-toolbox": "^
|
|
48
|
+
"@nomicfoundation/hardhat-toolbox": "^4.0.0",
|
|
49
49
|
};
|
|
50
50
|
|
|
51
51
|
const VIEM_PROJECT_DEPENDENCIES: Dependencies = {
|
|
52
|
-
"@nomicfoundation/hardhat-toolbox-viem": "^
|
|
52
|
+
"@nomicfoundation/hardhat-toolbox-viem": "^2.0.0",
|
|
53
53
|
};
|
|
54
54
|
|
|
55
55
|
const PEER_DEPENDENCIES: Dependencies = {
|
|
56
56
|
hardhat: "^2.14.0",
|
|
57
57
|
"@nomicfoundation/hardhat-network-helpers": "^1.0.0",
|
|
58
|
-
"@nomicfoundation/hardhat-verify": "^
|
|
58
|
+
"@nomicfoundation/hardhat-verify": "^2.0.0",
|
|
59
59
|
chai: "^4.2.0",
|
|
60
60
|
"hardhat-gas-reporter": "^1.0.8",
|
|
61
61
|
"solidity-coverage": "^0.8.0",
|
|
@@ -65,9 +65,9 @@ const ETHERS_PEER_DEPENDENCIES: Dependencies = {
|
|
|
65
65
|
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
|
|
66
66
|
"@nomicfoundation/hardhat-ethers": "^3.0.0",
|
|
67
67
|
ethers: "^6.4.0",
|
|
68
|
-
"@typechain/hardhat": "^
|
|
69
|
-
typechain: "^8.
|
|
70
|
-
"@typechain/ethers-v6": "^0.
|
|
68
|
+
"@typechain/hardhat": "^9.0.0",
|
|
69
|
+
typechain: "^8.3.0",
|
|
70
|
+
"@typechain/ethers-v6": "^0.5.0",
|
|
71
71
|
};
|
|
72
72
|
|
|
73
73
|
const VIEM_PEER_DEPENDENCIES: Dependencies = {
|
|
@@ -218,7 +218,10 @@ export function analyzeModuleNotFoundError(error: any, configPath: string) {
|
|
|
218
218
|
|
|
219
219
|
const missingPeerDependencies: { [name: string]: string } = {};
|
|
220
220
|
for (const [peerDependency, version] of Object.entries(peerDependencies)) {
|
|
221
|
-
const peerDependencyPackageJson = readPackageJson(
|
|
221
|
+
const peerDependencyPackageJson = readPackageJson(
|
|
222
|
+
peerDependency,
|
|
223
|
+
configPath
|
|
224
|
+
);
|
|
222
225
|
if (peerDependencyPackageJson === undefined) {
|
|
223
226
|
missingPeerDependencies[peerDependency] = version;
|
|
224
227
|
}
|
|
@@ -244,10 +247,18 @@ interface PackageJson {
|
|
|
244
247
|
};
|
|
245
248
|
}
|
|
246
249
|
|
|
247
|
-
function readPackageJson(
|
|
250
|
+
function readPackageJson(
|
|
251
|
+
packageName: string,
|
|
252
|
+
configPath: string
|
|
253
|
+
): PackageJson | undefined {
|
|
254
|
+
const resolve = require("resolve") as typeof import("resolve");
|
|
255
|
+
|
|
248
256
|
try {
|
|
249
|
-
const packageJsonPath =
|
|
250
|
-
path.join(packageName, "package.json")
|
|
257
|
+
const packageJsonPath = resolve.sync(
|
|
258
|
+
path.join(packageName, "package.json"),
|
|
259
|
+
{
|
|
260
|
+
basedir: path.dirname(configPath),
|
|
261
|
+
}
|
|
251
262
|
);
|
|
252
263
|
|
|
253
264
|
return require(packageJsonPath);
|
|
@@ -254,6 +254,25 @@ export class AutomaticGasPriceProvider extends ProviderWrapper {
|
|
|
254
254
|
],
|
|
255
255
|
})) as { baseFeePerGas: string[]; reward: string[][] };
|
|
256
256
|
|
|
257
|
+
let maxPriorityFeePerGas = rpcQuantityToBigInt(response.reward[0][0]);
|
|
258
|
+
|
|
259
|
+
if (maxPriorityFeePerGas === 0n) {
|
|
260
|
+
try {
|
|
261
|
+
const suggestedMaxPriorityFeePerGas =
|
|
262
|
+
(await this._wrappedProvider.request({
|
|
263
|
+
method: "eth_maxPriorityFeePerGas",
|
|
264
|
+
params: [],
|
|
265
|
+
})) as string;
|
|
266
|
+
|
|
267
|
+
maxPriorityFeePerGas = rpcQuantityToBigInt(
|
|
268
|
+
suggestedMaxPriorityFeePerGas
|
|
269
|
+
);
|
|
270
|
+
} catch {
|
|
271
|
+
// if eth_maxPriorityFeePerGas does not exist, use 1 wei
|
|
272
|
+
maxPriorityFeePerGas = 1n;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
|
|
257
276
|
return {
|
|
258
277
|
// Each block increases the base fee by 1/8 at most, when full.
|
|
259
278
|
// We have the next block's base fee, so we compute a cap for the
|
|
@@ -268,7 +287,7 @@ export class AutomaticGasPriceProvider extends ProviderWrapper {
|
|
|
268
287
|
(AutomaticGasPriceProvider.EIP1559_BASE_FEE_MAX_FULL_BLOCKS_PREFERENCE -
|
|
269
288
|
1n),
|
|
270
289
|
|
|
271
|
-
maxPriorityFeePerGas
|
|
290
|
+
maxPriorityFeePerGas,
|
|
272
291
|
};
|
|
273
292
|
} catch {
|
|
274
293
|
this._nodeHasFeeHistory = false;
|
|
@@ -60,7 +60,11 @@ export interface ICompilerDownloader {
|
|
|
60
60
|
* Downloads the compiler for a given version, which can later be obtained
|
|
61
61
|
* with getCompiler.
|
|
62
62
|
*/
|
|
63
|
-
downloadCompiler(
|
|
63
|
+
downloadCompiler(
|
|
64
|
+
version: string,
|
|
65
|
+
downloadStartedCb: (isCompilerDownloaded: boolean) => Promise<any>,
|
|
66
|
+
downloadEndedCb: (isCompilerDownloaded: boolean) => Promise<any>
|
|
67
|
+
): Promise<void>;
|
|
64
68
|
|
|
65
69
|
/**
|
|
66
70
|
* Returns the compiler, which MUST be downloaded before calling this function.
|
|
@@ -146,8 +150,24 @@ export class CompilerDownloader implements ICompilerDownloader {
|
|
|
146
150
|
return fsExtra.pathExists(downloadPath);
|
|
147
151
|
}
|
|
148
152
|
|
|
149
|
-
public async downloadCompiler(
|
|
153
|
+
public async downloadCompiler(
|
|
154
|
+
version: string,
|
|
155
|
+
downloadStartedCb: (isCompilerDownloaded: boolean) => Promise<any>,
|
|
156
|
+
downloadEndedCb: (isCompilerDownloaded: boolean) => Promise<any>
|
|
157
|
+
): Promise<void> {
|
|
158
|
+
// Since only one process at a time can acquire the mutex, we avoid the risk of downloading the same compiler multiple times.
|
|
159
|
+
// This is because the mutex blocks access until a compiler has been fully downloaded, preventing any new process
|
|
160
|
+
// from checking whether that version of the compiler exists. Without mutex it might incorrectly
|
|
161
|
+
// return false, indicating that the compiler isn't present, even though it is currently being downloaded.
|
|
150
162
|
await this._mutex.use(async () => {
|
|
163
|
+
const isCompilerDownloaded = await this.isCompilerDownloaded(version);
|
|
164
|
+
|
|
165
|
+
if (isCompilerDownloaded === true) {
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
await downloadStartedCb(isCompilerDownloaded);
|
|
170
|
+
|
|
151
171
|
let build = await this._getCompilerBuild(version);
|
|
152
172
|
|
|
153
173
|
if (build === undefined && (await this._shouldDownloadCompilerList())) {
|
|
@@ -189,6 +209,8 @@ export class CompilerDownloader implements ICompilerDownloader {
|
|
|
189
209
|
}
|
|
190
210
|
|
|
191
211
|
await this._postProcessCompilerDownload(build, downloadPath);
|
|
212
|
+
|
|
213
|
+
await downloadEndedCb(isCompilerDownloaded);
|
|
192
214
|
});
|
|
193
215
|
}
|
|
194
216
|
|