hardhat 3.0.11 → 3.0.13
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/CHANGELOG.md +16 -0
- package/dist/src/internal/builtin-plugins/console/task-action.js +1 -1
- package/dist/src/internal/builtin-plugins/console/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/run/task-action.js +1 -1
- package/dist/src/internal/builtin-plugins/run/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/artifacts.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/artifacts.js +1 -2
- package/dist/src/internal/builtin-plugins/solidity/build-system/artifacts.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js +19 -7
- package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.js +17 -3
- package/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/dependency-graph.d.ts +5 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/dependency-graph.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/dependency-graph.js +9 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/dependency-graph.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js +3 -4
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/test/task-action.js +1 -2
- package/dist/src/internal/builtin-plugins/test/task-action.js.map +1 -1
- package/dist/src/types/solidity/dependency-graph.d.ts +5 -0
- package/dist/src/types/solidity/dependency-graph.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/internal/builtin-plugins/console/task-action.ts +1 -1
- package/src/internal/builtin-plugins/run/task-action.ts +1 -1
- package/src/internal/builtin-plugins/solidity/build-system/artifacts.ts +2 -7
- package/src/internal/builtin-plugins/solidity/build-system/build-system.ts +31 -12
- package/src/internal/builtin-plugins/solidity/build-system/compilation-job.ts +17 -3
- package/src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts +14 -0
- package/src/internal/builtin-plugins/solidity-test/task-action.ts +3 -4
- package/src/internal/builtin-plugins/test/task-action.ts +1 -2
- package/src/types/solidity/dependency-graph.ts +6 -0
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +6 -6
- package/templates/hardhat-3/02-mocha-ethers/package.json +7 -7
- package/templates/hardhat-3/03-minimal/README.md +7 -0
- package/templates/hardhat-3/03-minimal/gitignore +20 -0
- package/templates/hardhat-3/03-minimal/hardhat.config.ts +7 -0
- package/templates/hardhat-3/03-minimal/package.json +12 -0
- package/templates/hardhat-3/03-minimal/tsconfig.json +13 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# hardhat
|
|
2
2
|
|
|
3
|
+
## 3.0.13
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 6e4ad6d: Fixed unexpected test failure when running in isolate/gas stats mode ([#1146](https://github.com/NomicFoundation/edr/issues/1146))
|
|
8
|
+
- 6e4ad6d: Added latest dynamic base fee parameters to Base Mainnet chain config ([#1141](https://github.com/NomicFoundation/edr/pull/1141))
|
|
9
|
+
|
|
10
|
+
## 3.0.12
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- 147f8a6: Improved the look and feel of compilation output ([#7669](https://github.com/NomicFoundation/hardhat/pull/7669))
|
|
15
|
+
- 50ce3e0: Fix a bug that could lead to different builds having the same build id. Note that this version will change how every build id is computed.
|
|
16
|
+
- 31f0b03: Don't compile solidity tests files when not needed ([#7669](https://github.com/NomicFoundation/hardhat/pull/7669))
|
|
17
|
+
- a77c06a: Added a new minimal sample project
|
|
18
|
+
|
|
3
19
|
## 3.0.11
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
|
@@ -19,7 +19,7 @@ const consoleAction = async ({ commands, history, noCompile, options }, hre) =>
|
|
|
19
19
|
historyPath = resolveFromRoot(cacheDir, history);
|
|
20
20
|
}
|
|
21
21
|
if (!noCompile) {
|
|
22
|
-
await hre.tasks.getTask("
|
|
22
|
+
await hre.tasks.getTask("build").run({ noTests: true, quiet: true });
|
|
23
23
|
}
|
|
24
24
|
return await new Promise(async (resolve) => {
|
|
25
25
|
// Start a new REPL server with the default options
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/console/task-action.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,GAAG,GAAG,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAUhD,MAAM,aAAa,GAAkD,KAAK,EACxE,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EACzC,GAAG,EACH,EAAE;IACF,MAAM,QAAQ,GAA+C;QAC3D,kBAAkB,EAAE,KAAK,IAAI,EAAE;YAC7B,OAAO,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAC/D,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;KACF,CAAC;IAEF,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;IAE1D,IAAI,CAAC;QACH,8CAA8C;QAC9C,IAAI,WAA+B,CAAC;QACpC,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YACxC,WAAW,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/console/task-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const runScriptWithHardhat = async ({ script, noCompile }, hre) => {
|
|
|
8
8
|
throw new HardhatError(HardhatError.ERRORS.CORE.BUILTIN_TASKS.RUN_FILE_NOT_FOUND, { script });
|
|
9
9
|
}
|
|
10
10
|
if (!noCompile) {
|
|
11
|
-
await hre.tasks.getTask("
|
|
11
|
+
await hre.tasks.getTask("build").run({ quiet: true, noTests: true });
|
|
12
12
|
console.log();
|
|
13
13
|
}
|
|
14
14
|
await import(pathToFileURL(normalizedPath).href);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/run/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAOtE,MAAM,oBAAoB,GAA8C,KAAK,EAC3E,EAAE,MAAM,EAAE,SAAS,EAAE,EACrB,GAAG,EACH,EAAE;IACF,MAAM,cAAc,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAE9D,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EACzD,EAAE,MAAM,EAAE,CACX,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/run/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAOtE,MAAM,oBAAoB,GAA8C,KAAK,EAC3E,EAAE,MAAM,EAAE,SAAS,EAAE,EACrB,GAAG,EACH,EAAE;IACF,MAAM,cAAc,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAE9D,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EACzD,EAAE,MAAM,EAAE,CACX,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,gCAAgC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACvB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,kDAAkD,CAAC;AAI1D,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,sBAAsB,GAC/B,QAAQ,CAiCV;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CA6BzE;AAED,wBAAgB,yCAAyC,CACvD,uBAAuB,EAAE,MAAM,EAAE,GAChC,MAAM,CAiBR;AAED,wBAAsB,YAAY,CAChC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,gCAAgC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACvB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,kDAAkD,CAAC;AAI1D,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,sBAAsB,GAC/B,QAAQ,CAiCV;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CA6BzE;AAED,wBAAgB,yCAAyC,CACvD,uBAAuB,EAAE,MAAM,EAAE,GAChC,MAAM,CAiBR;AAED,wBAAsB,YAAY,CAChC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,kBAAkB,CACtC,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,uBAAuB,CAAC,CAQlC"}
|
|
@@ -69,13 +69,12 @@ declare module "hardhat/types/artifacts" {
|
|
|
69
69
|
}`;
|
|
70
70
|
}
|
|
71
71
|
export async function getBuildInfo(compilationJob) {
|
|
72
|
-
const userSourceNameMap = Object.fromEntries([...compilationJob.dependencyGraph.getRoots().entries()].map(([userSourceName, root]) => [userSourceName, root.inputSourceName]));
|
|
73
72
|
const buildInfo = {
|
|
74
73
|
_format: "hh3-sol-build-info-1",
|
|
75
74
|
id: await compilationJob.getBuildId(),
|
|
76
75
|
solcVersion: compilationJob.solcConfig.version,
|
|
77
76
|
solcLongVersion: compilationJob.solcLongVersion,
|
|
78
|
-
userSourceNameMap,
|
|
77
|
+
userSourceNameMap: compilationJob.dependencyGraph.getRootsUserSourceNameMap(),
|
|
79
78
|
input: await compilationJob.getSolcInput(),
|
|
80
79
|
};
|
|
81
80
|
return buildInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/artifacts.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,UAAU,mBAAmB,CACjC,WAAmB,EACnB,cAAsB,EACtB,eAAuB,EACvB,YAAoB,EACpB,QAAgC;IAEhC,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IAC3C,MAAM,QAAQ,GACZ,WAAW,EAAE,MAAM,KAAK,SAAS;QAC/B,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,MAAM,CAAC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,mBAAmB,GAAG,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAC3D,MAAM,gBAAgB,GACpB,mBAAmB,EAAE,MAAM,KAAK,SAAS;QACvC,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,MAAM,CAAC;QAClD,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,cAAc,GAAG,WAAW,EAAE,cAAc,IAAI,EAAE,CAAC;IACzD,MAAM,sBAAsB,GAAG,mBAAmB,EAAE,cAAc,IAAI,EAAE,CAAC;IAEzE,MAAM,mBAAmB,GAAG,mBAAmB,EAAE,mBAAmB,IAAI,EAAE,CAAC;IAE3E,MAAM,QAAQ,GAAuB;QACnC,OAAO,EAAE,gBAAgB;QACzB,YAAY;QACZ,UAAU,EAAE,cAAc;QAC1B,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,QAAQ;QACR,gBAAgB;QAChB,cAAc;QACd,sBAAsB;QACtB,mBAAmB;QACnB,eAAe;QACf,WAAW;KACZ,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,SAAqB;IAC/D,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CACjC,CAAC,QAAQ,EAAE,EAAE,CACX,oBAAoB,QAAQ,CAAC,YAAY;IAC3C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,YAAY,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;SACrE,IAAI,CAAC,MAAM,CAAC;GACd,CACA,CAAC;IAEF,OAAO;;;;;;EAMP,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;MAKtB,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,QAAQ,CAAC,YAAY,OAAO,QAAQ,CAAC,YAAY,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;MACzG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,YAAY,OAAO,QAAQ,CAAC,YAAY,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;;EAEpI,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yCAAyC,CACvD,uBAAiC;IAEjC,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;;;;;;;;;MASH,uBAAuB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;;EAE9E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,cAA8B;IAE9B,MAAM,
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/artifacts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-system.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,2BAA2B,EAC3B,eAAe,EACf,yBAAyB,EACzB,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,uBAAuB,EACvB,UAAU,EACX,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AA4DvE,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACpC;AAED,qBAAa,iCAAkC,YAAW,mBAAmB;;gBAM/D,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,0BAA0B;IAKtD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiB7C,gBAAgB,CAC3B,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,MAAM,EAAE,CAAC;IAyCP,KAAK,CAChB,aAAa,EAAE,MAAM,EAAE,EACvB,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC,2BAA2B,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"build-system.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,2BAA2B,EAC3B,eAAe,EACf,yBAAyB,EACzB,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,uBAAuB,EACvB,UAAU,EACX,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AA4DvE,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACpC;AAED,qBAAa,iCAAkC,YAAW,mBAAmB;;gBAM/D,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,0BAA0B;IAKtD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiB7C,gBAAgB,CAC3B,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,MAAM,EAAE,CAAC;IAyCP,KAAK,CAChB,aAAa,EAAE,MAAM,EAAE,EACvB,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC,2BAA2B,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAyLzD,kBAAkB,CAC7B,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC,2BAA2B,GAAG,wBAAwB,CAAC;IAkPrD,iBAAiB,CAC5B,sBAAsB,EAAE,cAAc,EACtC,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,uBAAuB,CAAC;IAoCtB,kBAAkB,CAC7B,sBAAsB,EAAE,cAAc,EACtC,KAAK,EAAE,mBAAmB,EAC1B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,mBAAmB,CAAC;IA6BlB,aAAa,CACxB,sBAAsB,EAAE,cAAc,EACtC,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,mBAAmB,CAAC;IAiJlB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAMzD,gBAAgB,CAC3B,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,UAAU,CAAA;KAAO,GACnC,OAAO,CAAC,IAAI,CAAC;IAyGH,gBAAgB,CAC3B,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,CAAC,EAAE,uBAAuB,GACjC,OAAO,CAAC,cAAc,CAAC;CA6N3B"}
|
|
@@ -72,7 +72,7 @@ export class SolidityBuildSystemImplementation {
|
|
|
72
72
|
};
|
|
73
73
|
const spinner = createSpinner({
|
|
74
74
|
text: `Compiling your Solidity ${options.scope}...`,
|
|
75
|
-
enabled:
|
|
75
|
+
enabled: true,
|
|
76
76
|
});
|
|
77
77
|
await this.#downloadConfiguredCompilers(options.quiet);
|
|
78
78
|
spinner.start();
|
|
@@ -158,7 +158,9 @@ export class SolidityBuildSystemImplementation {
|
|
|
158
158
|
}
|
|
159
159
|
if (!options.quiet) {
|
|
160
160
|
if (isSuccessfulBuild) {
|
|
161
|
-
await this.#printCompilationResult(runnableCompilationJobs
|
|
161
|
+
await this.#printCompilationResult(runnableCompilationJobs, {
|
|
162
|
+
scope: options.scope,
|
|
163
|
+
});
|
|
162
164
|
}
|
|
163
165
|
}
|
|
164
166
|
return resultsMap;
|
|
@@ -550,15 +552,19 @@ export class SolidityBuildSystemImplementation {
|
|
|
550
552
|
if (errors === undefined) {
|
|
551
553
|
return;
|
|
552
554
|
}
|
|
555
|
+
console.log();
|
|
553
556
|
for (const error of errors) {
|
|
554
557
|
if (error.severity === "error") {
|
|
555
558
|
const errorMessage = this.#getFormattedInternalCompilerErrorMessage(error) ??
|
|
556
559
|
error.formattedMessage ??
|
|
557
560
|
error.message;
|
|
558
|
-
console.error(errorMessage.replace(/^\w+:/, (t) => chalk.red.bold(t)))
|
|
561
|
+
console.error(errorMessage.replace(/^\w+:/, (t) => chalk.red.bold(t)).trimEnd() +
|
|
562
|
+
"\n");
|
|
559
563
|
}
|
|
560
564
|
else {
|
|
561
|
-
console.warn((error.formattedMessage ?? error.message)
|
|
565
|
+
console.warn((error.formattedMessage ?? error.message)
|
|
566
|
+
.replace(/^\w+:/, (t) => chalk.yellow.bold(t))
|
|
567
|
+
.trimEnd() + "\n");
|
|
562
568
|
}
|
|
563
569
|
}
|
|
564
570
|
const hasConsoleErrors = errors.some((e) => this.#isConsoleLogError(e));
|
|
@@ -567,10 +573,16 @@ export class SolidityBuildSystemImplementation {
|
|
|
567
573
|
console.log();
|
|
568
574
|
}
|
|
569
575
|
}
|
|
570
|
-
async #printCompilationResult(runnableCompilationJobs) {
|
|
576
|
+
async #printCompilationResult(runnableCompilationJobs, options) {
|
|
571
577
|
const jobsPerVersionAndEvmVersion = new Map();
|
|
572
578
|
if (runnableCompilationJobs.length === 0) {
|
|
573
|
-
|
|
579
|
+
if (options.scope === "contracts") {
|
|
580
|
+
console.log("No contracts to compile");
|
|
581
|
+
}
|
|
582
|
+
else {
|
|
583
|
+
console.log("No Solidity tests to compile");
|
|
584
|
+
}
|
|
585
|
+
return;
|
|
574
586
|
}
|
|
575
587
|
for (const job of runnableCompilationJobs) {
|
|
576
588
|
const solcVersion = job.solcConfig.version;
|
|
@@ -598,7 +610,7 @@ export class SolidityBuildSystemImplementation {
|
|
|
598
610
|
This is a valid key, just sorted */
|
|
599
611
|
const jobs = jobsPerEvmVersion.get(evmVersion);
|
|
600
612
|
const rootFiles = jobs.reduce((count, job) => count + job.dependencyGraph.getRoots().size, 0);
|
|
601
|
-
console.log(`Compiled ${rootFiles} Solidity ${pluralize("file", rootFiles)} with solc ${solcVersion} (evm target: ${evmVersion})`);
|
|
613
|
+
console.log(chalk.bold(`Compiled ${rootFiles} Solidity ${pluralize(options.scope === "contracts" ? "file" : "test file", rootFiles)} with solc ${solcVersion}`), `(evm target: ${evmVersion})`);
|
|
602
614
|
}
|
|
603
615
|
}
|
|
604
616
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-system.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build-system.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/build-system.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compilation-job.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAetF,qBAAa,4BAA6B,YAAW,cAAc;;IACjE,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,SAAgB,eAAe,EAAE,MAAM,CAAC;gBAWtC,eAAe,EAAE,6BAA6B,EAC9C,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,mBAAmB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa;IASzC,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAoBtC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"compilation-job.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAetF,qBAAa,4BAA6B,YAAW,cAAc;;IACjE,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,SAAgB,eAAe,EAAE,MAAM,CAAC;gBAWtC,eAAe,EAAE,6BAA6B,EAC9C,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,mBAAmB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa;IASzC,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAoBtC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAiM3C"}
|
|
@@ -133,14 +133,28 @@ export class CompilationJobImplementation {
|
|
|
133
133
|
sourceName,
|
|
134
134
|
{ content: this.#getSourceContentHash(sourceName, _source.content) },
|
|
135
135
|
]));
|
|
136
|
-
// The preimage should include all the information
|
|
137
|
-
// compilation job unique
|
|
138
|
-
//
|
|
136
|
+
// EXTREMELY IMPORTANT: The preimage should include **all** the information
|
|
137
|
+
// that makes this compilation job unique from the point of view of Hardhat.
|
|
138
|
+
//
|
|
139
|
+
// Note that we can have multiple compilation jobs that are equivalent from
|
|
140
|
+
// the point of view of solc, but not for Hardhat. (e.g. same input,
|
|
141
|
+
// config, version, but different root files).
|
|
142
|
+
//
|
|
143
|
+
// Also note that we include the build info format here. Technically, this
|
|
144
|
+
// violates the encapsulation of this class a bit. We could leave that
|
|
145
|
+
// field out, and then recompute the BuildInfo id based on the compilation
|
|
146
|
+
// job id and the BuildInfo format. We add it here instead to keep both
|
|
147
|
+
// ids the same, and as a small performance optimization.
|
|
148
|
+
//
|
|
149
|
+
// Changing this shouldn't be taken lightly, as it makes reproducing
|
|
150
|
+
// builds pretty difficult when upgrading Hardhat between versions that
|
|
151
|
+
// change it.
|
|
139
152
|
const preimage = JSON.stringify({
|
|
140
153
|
format,
|
|
141
154
|
solcLongVersion: this.solcLongVersion,
|
|
142
155
|
smallerSolcInput,
|
|
143
156
|
solcConfig: this.solcConfig,
|
|
157
|
+
userSourceNameMap: this.dependencyGraph.getRootsUserSourceNameMap(),
|
|
144
158
|
});
|
|
145
159
|
const jobHash = await createNonCryptographicHashId(preimage);
|
|
146
160
|
return `solc-${this.solcConfig.version.replaceAll(".", "_")}-${jobHash}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compilation-job.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,OAAO,EACL,gBAAgB,GAEjB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAE9D,MAAM,OAAO,4BAA4B;IACvB,eAAe,CAAkB;IACjC,UAAU,CAAa;IACvB,eAAe,CAAS;IAE/B,MAAM,CAAc;IAC7B,kGAAkG;IAClG,yDAAyD;IAChD,oBAAoB,CAAsB;IAEnD,QAAQ,CAAqB;IAC7B,UAAU,CAA4B;IAEtC,YACE,eAA8C,EAC9C,UAAsB,EACtB,eAAuB,EACvB,KAAkB,EAClB,sBAA2C,IAAI,GAAG,EAAE;QAEpD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC/C,0EAA0E;YAC1E,qEAAqE;YACrE,yEAAyE;YACzE,sBAAsB;YACtB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CACjD,UAAU,EACV,mCAAmC,EACnC,CAAC,SAAS,CAAC,EACX,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE;gBAChC,OAAO,aAAa,CAAC;YACvB,CAAC,CACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/C,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAkB;QACtC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,gBAAgB,CAAC,gBAAgB;gBACpC,uEAAuE;gBACvE,+CAA+C;gBAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAC3B,KAAK,gBAAgB,CAAC,YAAY;gBAChC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC5C,4EAA4E;gBAC5E,6EAA6E;gBAC7E,wEAAwE;gBACxE,mFAAmF;gBACnF,mFAAmF;gBACnF,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAChC,UAAU,EACV,qCAAqC,EACrC,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EACnE,KAAK,EACH,QAAQ,EACR,mBAAmB,EACnB,UAAU,EACV,eAAe,EACf,eAAe,EACf,EAAE;oBACF,KAAK,MAAM,CAAC,SAAS,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI;wBAC9D,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC;wBAC9D,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC;wBACnC,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,CAAC;qBAC9C,EAAE,CAAC;wBACF,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;4BAC5C,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,kCAAkC,EACjE;gCACE,gBAAgB,EAAE,UAAU;gCAC5B,QAAQ,EAAE,qCAAqC;gCAC/C,SAAS;6BACV,CACF,CAAC;wBACJ,CAAC;oBACH,CAAC;oBAED,OAAO,eAAe,CAAC;gBACzB,CAAC,CACF,CAAC;QACN,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAE1C,wEAAwE;QACxE,8CAA8C;QAC9C,2EAA2E;QAC3E,yEAAyE;QACzE,oEAAoE;QACpE,YAAY;QACZ,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QACxE,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAC5B,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAEjC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAC5B,KAAK,EACL,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,UAAU,CACX,CAAC;QAEF,MAAM,OAAO,GAAkD,EAAE,CAAC;QAElE,qEAAqE;QACrE,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC1E,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CACnD,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG;gBAC9B,OAAO;aACR,CAAC;QACJ,CAAC;QAED,MAAM,gBAAgB,GAA8B;YAClD,GAAG,QAAQ;YACX,UAAU,EACR,QAAQ,CAAC,UAAU;gBACnB,4BAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YACvD,eAAe,EAAE,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC;YACpE,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE;SACpD,CAAC;QAEF;4EACoE;QACpE,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CACvC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CACvD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CACzB,CAC2B,CAAC;QAE/B,OAAO;YACL,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE,cAAc;YACxB,OAAO;SACR,CAAC;IACJ,CAAC;IAED,6BAA6B,CAC3B,eAA6D;QAE7D,MAAM,sBAAsB,GAC1B,EAAE,CAAC;QAEL,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7D,sBAAsB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAE9C,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;gBACzD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;gBAE1C,sBAAsB,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,IAAI,CAC3D,IAAI,GAAG,CAAC,SAAS,CAAC,CACnB,CAAC,IAAI,EAAE,CAAC;YACX,CAAC;QACH,CAAC;QAED,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,0EAA0E;QAC1E,oCAAoC;QACpC,MAAM,MAAM,GAAyB,sBAAsB,CAAC;QAE5D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC;QAE1C,iGAAiG;QACjG,gBAAgB,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAC3C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YAC/D,UAAU;YACV,EAAE,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;SACrE,CAAC,CACH,CAAC;QAEF,
|
|
1
|
+
{"version":3,"file":"compilation-job.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,11 @@ export declare class DependencyGraphImplementation implements DependencyGraph {
|
|
|
33
33
|
* Returns a map of user source names to root files.
|
|
34
34
|
*/
|
|
35
35
|
getRoots(): ReadonlyMap<string, ResolvedFile>;
|
|
36
|
+
/**
|
|
37
|
+
* Returns a sorted map of userSourceName to inputSourceName for every
|
|
38
|
+
* root of the graph.
|
|
39
|
+
*/
|
|
40
|
+
getRootsUserSourceNameMap(): Record<string, string>;
|
|
36
41
|
/**
|
|
37
42
|
* Returns a set of all the files in the graph.
|
|
38
43
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAIhF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7D,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CACnC,MAAM,EACN,MAAM,CACP,CAAC;IACF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAC3B,MAAM,EACN,MAAM,CAAC,MAAM,EAA6B,MAAM,EAAE,CAAkB,CACrE,CAAC;CACH;AAED,qBAAa,6BAA8B,YAAW,eAAe;;IAQnE;;;;;;;;;OASG;IACI,WAAW,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI;IAKpE;;;;;;;;;OASG;IACI,aAAa,CAClB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,YAAY,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI;IAsBP;;OAEG;IACI,QAAQ,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;IAIpD;;OAEG;IACI,WAAW,IAAI,QAAQ,CAAC,YAAY,CAAC;IAIrC,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;IAIpC,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,CAAC;QACtD,IAAI,EAAE,YAAY,CAAC;QACnB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KACjC,CAAC;IAcK,wBAAwB,CAC7B,eAAe,EAAE,MAAM,GACtB,YAAY,GAAG,SAAS;IAIpB,WAAW,CAChB,GAAG,mBAAmB,EAAE,MAAM,EAAE,GAC/B,6BAA6B;IAkCzB,KAAK,CACV,KAAK,EAAE,6BAA6B,GACnC,6BAA6B;IAqCzB,gBAAgB,IAAI,SAAS,MAAM,EAAE;IAUrC,MAAM,IAAI,iCAAiC;CA2CnD"}
|
|
1
|
+
{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAIhF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7D,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CACnC,MAAM,EACN,MAAM,CACP,CAAC;IACF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAC3B,MAAM,EACN,MAAM,CAAC,MAAM,EAA6B,MAAM,EAAE,CAAkB,CACrE,CAAC;CACH;AAED,qBAAa,6BAA8B,YAAW,eAAe;;IAQnE;;;;;;;;;OASG;IACI,WAAW,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI;IAKpE;;;;;;;;;OASG;IACI,aAAa,CAClB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,YAAY,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI;IAsBP;;OAEG;IACI,QAAQ,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;IAIpD;;;OAGG;IACI,yBAAyB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAU1D;;OAEG;IACI,WAAW,IAAI,QAAQ,CAAC,YAAY,CAAC;IAIrC,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;IAIpC,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,CAAC;QACtD,IAAI,EAAE,YAAY,CAAC;QACnB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KACjC,CAAC;IAcK,wBAAwB,CAC7B,eAAe,EAAE,MAAM,GACtB,YAAY,GAAG,SAAS;IAIpB,WAAW,CAChB,GAAG,mBAAmB,EAAE,MAAM,EAAE,GAC/B,6BAA6B;IAkCzB,KAAK,CACV,KAAK,EAAE,6BAA6B,GACnC,6BAA6B;IAqCzB,gBAAgB,IAAI,SAAS,MAAM,EAAE;IAUrC,MAAM,IAAI,iCAAiC;CA2CnD"}
|
|
@@ -48,6 +48,15 @@ export class DependencyGraphImplementation {
|
|
|
48
48
|
getRoots() {
|
|
49
49
|
return this.#rootByUserSourceName;
|
|
50
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* Returns a sorted map of userSourceName to inputSourceName for every
|
|
53
|
+
* root of the graph.
|
|
54
|
+
*/
|
|
55
|
+
getRootsUserSourceNameMap() {
|
|
56
|
+
return Object.fromEntries([...this.getRoots().entries()]
|
|
57
|
+
.map(([userSourceName, root]) => [userSourceName, root.inputSourceName])
|
|
58
|
+
.sort(([userSourceName1, _], [userSourceName2, __]) => userSourceName1.localeCompare(userSourceName2)));
|
|
59
|
+
}
|
|
51
60
|
/**
|
|
52
61
|
* Returns a set of all the files in the graph.
|
|
53
62
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-graph.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dependency-graph.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AA4CrE,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,gBAAgB,EAAE,qBAAqB,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AA4CrE,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,gBAAgB,EAAE,qBAAqB,CAAC,mBAAmB,CA+LhE,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
|
@@ -27,15 +27,14 @@ const runSolidityTests = async ({ testFiles, chainType, grep, noCompile, verbosi
|
|
|
27
27
|
name: "chainType",
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
|
-
// Run the
|
|
30
|
+
// Run the build task for test files
|
|
31
31
|
const { testRootPaths } = await hre.tasks
|
|
32
|
-
.getTask("
|
|
32
|
+
.getTask("build")
|
|
33
33
|
.run({
|
|
34
|
-
quiet: true,
|
|
35
|
-
force: false,
|
|
36
34
|
files: testFiles,
|
|
37
35
|
noContracts: noCompile,
|
|
38
36
|
});
|
|
37
|
+
console.log();
|
|
39
38
|
// EDR needs all artifacts (contracts + tests)
|
|
40
39
|
const edrArtifacts = [];
|
|
41
40
|
const buildInfos = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/task-action.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,uCAAuC,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EACL,gBAAgB,IAAI,YAAY,EAChC,kBAAkB,IAAI,gBAAgB,EACtC,eAAe,IAAI,cAAc,GAClC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,gBAAgB,IAAI,YAAY,EAChC,kBAAkB,IAAI,gBAAgB,EACtC,eAAe,IAAI,cAAc,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,oCAAoC,EAAE,MAAM,gDAAgD,CAAC;AAEtG,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,8BAA8B,EAC9B,gDAAgD,GACjD,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAUlC,MAAM,gBAAgB,GAA+C,KAAK,EACxE,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EACpD,GAAG,EACH,EAAE;IACF,sBAAsB,CACpB,GAAG,YAAY,uCAAuC,EACtD,2EAA2E,CAC5E,CAAC;IAEF,6FAA6F;IAC7F,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC;IAE7B,iGAAiG;IACjG,0DAA0D;IAC1D,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC;IAEhC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EACzD;YACE,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,WAAW;SAClB,CACF,CAAC;IACJ,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/task-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,yBAAyB,CAAC;AASjC,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,WAAW,EAAE,qBAAqB,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,yBAAyB,CAAC;AASjC,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,WAAW,EAAE,qBAAqB,CAAC,mBAAmB,CAoE3D,CAAC;AAyDF,eAAe,WAAW,CAAC"}
|
|
@@ -9,10 +9,9 @@ const runAllTests = async ({ testFiles, chainType, grep, noCompile, verbosity },
|
|
|
9
9
|
: {};
|
|
10
10
|
const thisTask = hre.tasks.getTask("test");
|
|
11
11
|
if (!noCompile) {
|
|
12
|
-
await hre.tasks.getTask("
|
|
12
|
+
await hre.tasks.getTask("build").run({
|
|
13
13
|
noTests: true,
|
|
14
14
|
});
|
|
15
|
-
console.log();
|
|
16
15
|
}
|
|
17
16
|
if (hre.globalOptions.coverage === true) {
|
|
18
17
|
assertHardhatInvariant(hre instanceof HardhatRuntimeEnvironmentImplementation, "Expected HRE to be an instance of HardhatRuntimeEnvironmentImplementation");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,uCAAuC,EAAE,MAAM,mBAAmB,CAAC;AAU5E,MAAM,WAAW,GAA+C,KAAK,EACnE,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EACpD,GAAG,EACH,EAAE;IACF,+EAA+E;IAC/E,iGAAiG;IACjG,0IAA0I;IAC1I,MAAM,eAAe,GACnB,SAAS,CAAC,MAAM,KAAK,CAAC;QACpB,CAAC,CAAC,MAAM,2BAA2B,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/test/task-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,11 @@ export interface DependencyGraph {
|
|
|
7
7
|
* Gets a map of user source names to root files.
|
|
8
8
|
*/
|
|
9
9
|
getRoots(): ReadonlyMap<string, ResolvedFile>;
|
|
10
|
+
/**
|
|
11
|
+
* Returns a sorted map of userSourceName to inputSourceName for every
|
|
12
|
+
* root of the graph.
|
|
13
|
+
*/
|
|
14
|
+
getRootsUserSourceNameMap(): Record<string, string>;
|
|
10
15
|
/**
|
|
11
16
|
* Returns an iterable with all the files.
|
|
12
17
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/dependency-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,QAAQ,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9C;;OAEG;IACH,WAAW,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;IAEtC;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC;IAErC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,CAAC;QAC/C,IAAI,EAAE,YAAY,CAAC;QACnB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KACjC,CAAC,CAAC;IAEH;;;;;;OAMG;IACH,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IAE5E;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,mBAAmB,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC;IAE/D;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAAC;IAE/C;;OAEG;IACH,gBAAgB,IAAI,SAAS,MAAM,EAAE,CAAC;CACvC"}
|
|
1
|
+
{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/dependency-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,QAAQ,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9C;;;OAGG;IACH,yBAAyB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpD;;OAEG;IACH,WAAW,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;IAEtC;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC;IAErC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,CAAC;QAC/C,IAAI,EAAE,YAAY,CAAC;QACnB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KACjC,CAAC,CAAC;IAEH;;;;;;OAMG;IACH,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IAE5E;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,mBAAmB,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC;IAE/D;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAAC;IAE/C;;OAEG;IACH,gBAAgB,IAAI,SAAS,MAAM,EAAE,CAAC;CACvC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hardhat",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.13",
|
|
4
4
|
"description": "Hardhat is an extensible developer tool that helps smart contract developers increase productivity by reliably bringing together the tools they want.",
|
|
5
5
|
"homepage": "https://github.com/nomicfoundation/hardhat/tree/v-next/v-next/hardhat",
|
|
6
6
|
"repository": {
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@nomicfoundation/hardhat-test-utils": "^2.0.1"
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@nomicfoundation/edr": "0.12.0-next.
|
|
74
|
+
"@nomicfoundation/edr": "0.12.0-next.14",
|
|
75
75
|
"@nomicfoundation/hardhat-errors": "^3.0.3",
|
|
76
76
|
"@nomicfoundation/hardhat-utils": "^3.0.5",
|
|
77
77
|
"@nomicfoundation/hardhat-zod-utils": "^3.0.1",
|
|
@@ -42,7 +42,7 @@ const consoleAction: NewTaskActionFunction<ConsoleActionArguments> = async (
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
if (!noCompile) {
|
|
45
|
-
await hre.tasks.getTask("
|
|
45
|
+
await hre.tasks.getTask("build").run({ noTests: true, quiet: true });
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
return await new Promise<REPLServer>(async (resolve) => {
|
|
@@ -107,18 +107,13 @@ declare module "hardhat/types/artifacts" {
|
|
|
107
107
|
export async function getBuildInfo(
|
|
108
108
|
compilationJob: CompilationJob,
|
|
109
109
|
): Promise<SolidityBuildInfo> {
|
|
110
|
-
const userSourceNameMap = Object.fromEntries(
|
|
111
|
-
[...compilationJob.dependencyGraph.getRoots().entries()].map(
|
|
112
|
-
([userSourceName, root]) => [userSourceName, root.inputSourceName],
|
|
113
|
-
),
|
|
114
|
-
);
|
|
115
|
-
|
|
116
110
|
const buildInfo: Required<BuildInfo> = {
|
|
117
111
|
_format: "hh3-sol-build-info-1",
|
|
118
112
|
id: await compilationJob.getBuildId(),
|
|
119
113
|
solcVersion: compilationJob.solcConfig.version,
|
|
120
114
|
solcLongVersion: compilationJob.solcLongVersion,
|
|
121
|
-
userSourceNameMap
|
|
115
|
+
userSourceNameMap:
|
|
116
|
+
compilationJob.dependencyGraph.getRootsUserSourceNameMap(),
|
|
122
117
|
input: await compilationJob.getSolcInput(),
|
|
123
118
|
};
|
|
124
119
|
|
|
@@ -178,7 +178,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
178
178
|
|
|
179
179
|
const spinner = createSpinner({
|
|
180
180
|
text: `Compiling your Solidity ${options.scope}...`,
|
|
181
|
-
enabled:
|
|
181
|
+
enabled: true,
|
|
182
182
|
});
|
|
183
183
|
|
|
184
184
|
await this.#downloadConfiguredCompilers(options.quiet);
|
|
@@ -341,7 +341,9 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
341
341
|
|
|
342
342
|
if (!options.quiet) {
|
|
343
343
|
if (isSuccessfulBuild) {
|
|
344
|
-
await this.#printCompilationResult(runnableCompilationJobs
|
|
344
|
+
await this.#printCompilationResult(runnableCompilationJobs, {
|
|
345
|
+
scope: options.scope,
|
|
346
|
+
});
|
|
345
347
|
}
|
|
346
348
|
}
|
|
347
349
|
|
|
@@ -1048,6 +1050,8 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1048
1050
|
return;
|
|
1049
1051
|
}
|
|
1050
1052
|
|
|
1053
|
+
console.log();
|
|
1054
|
+
|
|
1051
1055
|
for (const error of errors) {
|
|
1052
1056
|
if (error.severity === "error") {
|
|
1053
1057
|
const errorMessage: string =
|
|
@@ -1055,12 +1059,15 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1055
1059
|
error.formattedMessage ??
|
|
1056
1060
|
error.message;
|
|
1057
1061
|
|
|
1058
|
-
console.error(
|
|
1062
|
+
console.error(
|
|
1063
|
+
errorMessage.replace(/^\w+:/, (t) => chalk.red.bold(t)).trimEnd() +
|
|
1064
|
+
"\n",
|
|
1065
|
+
);
|
|
1059
1066
|
} else {
|
|
1060
1067
|
console.warn(
|
|
1061
|
-
(error.formattedMessage ?? error.message)
|
|
1062
|
-
chalk.yellow.bold(t)
|
|
1063
|
-
|
|
1068
|
+
(error.formattedMessage ?? error.message)
|
|
1069
|
+
.replace(/^\w+:/, (t) => chalk.yellow.bold(t))
|
|
1070
|
+
.trimEnd() + "\n",
|
|
1064
1071
|
);
|
|
1065
1072
|
}
|
|
1066
1073
|
}
|
|
@@ -1079,14 +1086,23 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1079
1086
|
}
|
|
1080
1087
|
}
|
|
1081
1088
|
|
|
1082
|
-
async #printCompilationResult(
|
|
1089
|
+
async #printCompilationResult(
|
|
1090
|
+
runnableCompilationJobs: CompilationJob[],
|
|
1091
|
+
options: { scope: BuildScope },
|
|
1092
|
+
) {
|
|
1083
1093
|
const jobsPerVersionAndEvmVersion = new Map<
|
|
1084
1094
|
string,
|
|
1085
1095
|
Map<string, CompilationJob[]>
|
|
1086
1096
|
>();
|
|
1087
1097
|
|
|
1088
1098
|
if (runnableCompilationJobs.length === 0) {
|
|
1089
|
-
|
|
1099
|
+
if (options.scope === "contracts") {
|
|
1100
|
+
console.log("No contracts to compile");
|
|
1101
|
+
} else {
|
|
1102
|
+
console.log("No Solidity tests to compile");
|
|
1103
|
+
}
|
|
1104
|
+
|
|
1105
|
+
return;
|
|
1090
1106
|
}
|
|
1091
1107
|
|
|
1092
1108
|
for (const job of runnableCompilationJobs) {
|
|
@@ -1127,10 +1143,13 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
|
|
|
1127
1143
|
);
|
|
1128
1144
|
|
|
1129
1145
|
console.log(
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1146
|
+
chalk.bold(
|
|
1147
|
+
`Compiled ${rootFiles} Solidity ${pluralize(
|
|
1148
|
+
options.scope === "contracts" ? "file" : "test file",
|
|
1149
|
+
rootFiles,
|
|
1150
|
+
)} with solc ${solcVersion}`,
|
|
1151
|
+
),
|
|
1152
|
+
`(evm target: ${evmVersion})`,
|
|
1134
1153
|
);
|
|
1135
1154
|
}
|
|
1136
1155
|
}
|
|
@@ -220,14 +220,28 @@ export class CompilationJobImplementation implements CompilationJob {
|
|
|
220
220
|
]),
|
|
221
221
|
);
|
|
222
222
|
|
|
223
|
-
// The preimage should include all the information
|
|
224
|
-
// compilation job unique
|
|
225
|
-
//
|
|
223
|
+
// EXTREMELY IMPORTANT: The preimage should include **all** the information
|
|
224
|
+
// that makes this compilation job unique from the point of view of Hardhat.
|
|
225
|
+
//
|
|
226
|
+
// Note that we can have multiple compilation jobs that are equivalent from
|
|
227
|
+
// the point of view of solc, but not for Hardhat. (e.g. same input,
|
|
228
|
+
// config, version, but different root files).
|
|
229
|
+
//
|
|
230
|
+
// Also note that we include the build info format here. Technically, this
|
|
231
|
+
// violates the encapsulation of this class a bit. We could leave that
|
|
232
|
+
// field out, and then recompute the BuildInfo id based on the compilation
|
|
233
|
+
// job id and the BuildInfo format. We add it here instead to keep both
|
|
234
|
+
// ids the same, and as a small performance optimization.
|
|
235
|
+
//
|
|
236
|
+
// Changing this shouldn't be taken lightly, as it makes reproducing
|
|
237
|
+
// builds pretty difficult when upgrading Hardhat between versions that
|
|
238
|
+
// change it.
|
|
226
239
|
const preimage = JSON.stringify({
|
|
227
240
|
format,
|
|
228
241
|
solcLongVersion: this.solcLongVersion,
|
|
229
242
|
smallerSolcInput,
|
|
230
243
|
solcConfig: this.solcConfig,
|
|
244
|
+
userSourceNameMap: this.dependencyGraph.getRootsUserSourceNameMap(),
|
|
231
245
|
});
|
|
232
246
|
|
|
233
247
|
const jobHash = await createNonCryptographicHashId(preimage);
|
|
@@ -81,6 +81,20 @@ export class DependencyGraphImplementation implements DependencyGraph {
|
|
|
81
81
|
return this.#rootByUserSourceName;
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
+
/**
|
|
85
|
+
* Returns a sorted map of userSourceName to inputSourceName for every
|
|
86
|
+
* root of the graph.
|
|
87
|
+
*/
|
|
88
|
+
public getRootsUserSourceNameMap(): Record<string, string> {
|
|
89
|
+
return Object.fromEntries(
|
|
90
|
+
[...this.getRoots().entries()]
|
|
91
|
+
.map(([userSourceName, root]) => [userSourceName, root.inputSourceName])
|
|
92
|
+
.sort(([userSourceName1, _], [userSourceName2, __]) =>
|
|
93
|
+
userSourceName1.localeCompare(userSourceName2),
|
|
94
|
+
),
|
|
95
|
+
);
|
|
96
|
+
}
|
|
97
|
+
|
|
84
98
|
/**
|
|
85
99
|
* Returns a set of all the files in the graph.
|
|
86
100
|
*/
|
|
@@ -79,15 +79,14 @@ const runSolidityTests: NewTaskActionFunction<TestActionArguments> = async (
|
|
|
79
79
|
);
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
// Run the
|
|
82
|
+
// Run the build task for test files
|
|
83
83
|
const { testRootPaths }: { testRootPaths: string[] } = await hre.tasks
|
|
84
|
-
.getTask("
|
|
84
|
+
.getTask("build")
|
|
85
85
|
.run({
|
|
86
|
-
quiet: true,
|
|
87
|
-
force: false,
|
|
88
86
|
files: testFiles,
|
|
89
87
|
noContracts: noCompile,
|
|
90
88
|
});
|
|
89
|
+
console.log();
|
|
91
90
|
|
|
92
91
|
// EDR needs all artifacts (contracts + tests)
|
|
93
92
|
const edrArtifacts: Array<{
|
|
@@ -35,10 +35,9 @@ const runAllTests: NewTaskActionFunction<TestActionArguments> = async (
|
|
|
35
35
|
const thisTask = hre.tasks.getTask("test");
|
|
36
36
|
|
|
37
37
|
if (!noCompile) {
|
|
38
|
-
await hre.tasks.getTask("
|
|
38
|
+
await hre.tasks.getTask("build").run({
|
|
39
39
|
noTests: true,
|
|
40
40
|
});
|
|
41
|
-
console.log();
|
|
42
41
|
}
|
|
43
42
|
|
|
44
43
|
if (hre.globalOptions.coverage === true) {
|
|
@@ -9,6 +9,12 @@ export interface DependencyGraph {
|
|
|
9
9
|
*/
|
|
10
10
|
getRoots(): ReadonlyMap<string, ResolvedFile>;
|
|
11
11
|
|
|
12
|
+
/**
|
|
13
|
+
* Returns a sorted map of userSourceName to inputSourceName for every
|
|
14
|
+
* root of the graph.
|
|
15
|
+
*/
|
|
16
|
+
getRootsUserSourceNameMap(): Record<string, string>;
|
|
17
|
+
|
|
12
18
|
/**
|
|
13
19
|
* Returns an iterable with all the files.
|
|
14
20
|
*/
|
|
@@ -5,22 +5,22 @@
|
|
|
5
5
|
"description": "A TypeScript Hardhat project using Node Test Runner and Viem",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"devDependencies": {
|
|
8
|
-
"hardhat": "workspace:^3.0.
|
|
8
|
+
"hardhat": "workspace:^3.0.13",
|
|
9
9
|
"@nomicfoundation/hardhat-toolbox-viem": "workspace:^5.0.1",
|
|
10
|
-
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.
|
|
10
|
+
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.5",
|
|
11
11
|
"@types/node": "^22.8.5",
|
|
12
12
|
"forge-std": "foundry-rs/forge-std#v1.9.4",
|
|
13
13
|
"typescript": "~5.8.0",
|
|
14
14
|
"viem": "^2.30.0"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@nomicfoundation/hardhat-ignition-viem": "workspace:^3.0.
|
|
17
|
+
"@nomicfoundation/hardhat-ignition-viem": "workspace:^3.0.5",
|
|
18
18
|
"@nomicfoundation/hardhat-keystore": "workspace:^3.0.2",
|
|
19
19
|
"@nomicfoundation/hardhat-network-helpers": "workspace:^3.0.1",
|
|
20
|
-
"@nomicfoundation/hardhat-node-test-runner": "workspace:^3.0.
|
|
20
|
+
"@nomicfoundation/hardhat-node-test-runner": "workspace:^3.0.7",
|
|
21
21
|
"@nomicfoundation/hardhat-viem": "workspace:^3.0.0",
|
|
22
22
|
"@nomicfoundation/hardhat-viem-assertions": "workspace:^3.0.0",
|
|
23
|
-
"@nomicfoundation/hardhat-verify": "workspace:^3.0.
|
|
24
|
-
"@nomicfoundation/ignition-core": "workspace:^3.0.
|
|
23
|
+
"@nomicfoundation/hardhat-verify": "workspace:^3.0.6",
|
|
24
|
+
"@nomicfoundation/ignition-core": "workspace:^3.0.5"
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
"description": "A TypeScript Hardhat project using Mocha and Ethers.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"devDependencies": {
|
|
8
|
-
"hardhat": "workspace:^3.0.
|
|
8
|
+
"hardhat": "workspace:^3.0.13",
|
|
9
9
|
"@nomicfoundation/hardhat-toolbox-mocha-ethers": "workspace:^3.0.1",
|
|
10
|
-
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.
|
|
10
|
+
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.5",
|
|
11
11
|
"@types/chai": "^4.2.0",
|
|
12
12
|
"@types/chai-as-promised": "^8.0.1",
|
|
13
13
|
"@types/mocha": ">=10.0.10",
|
|
@@ -21,13 +21,13 @@
|
|
|
21
21
|
"peerDependencies": {
|
|
22
22
|
"@nomicfoundation/hardhat-ethers": "workspace:^4.0.2",
|
|
23
23
|
"@nomicfoundation/hardhat-ethers-chai-matchers": "workspace:^3.0.0",
|
|
24
|
-
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.
|
|
25
|
-
"@nomicfoundation/hardhat-ignition-ethers": "workspace:^3.0.
|
|
24
|
+
"@nomicfoundation/hardhat-ignition": "workspace:^3.0.5",
|
|
25
|
+
"@nomicfoundation/hardhat-ignition-ethers": "workspace:^3.0.5",
|
|
26
26
|
"@nomicfoundation/hardhat-keystore": "workspace:^3.0.2",
|
|
27
|
-
"@nomicfoundation/hardhat-mocha": "workspace:^3.0.
|
|
27
|
+
"@nomicfoundation/hardhat-mocha": "workspace:^3.0.7",
|
|
28
28
|
"@nomicfoundation/hardhat-network-helpers": "workspace:^3.0.1",
|
|
29
29
|
"@nomicfoundation/hardhat-typechain": "workspace:^3.0.0",
|
|
30
|
-
"@nomicfoundation/hardhat-verify": "workspace:^3.0.
|
|
31
|
-
"@nomicfoundation/ignition-core": "workspace:^3.0.
|
|
30
|
+
"@nomicfoundation/hardhat-verify": "workspace:^3.0.6",
|
|
31
|
+
"@nomicfoundation/ignition-core": "workspace:^3.0.5"
|
|
32
32
|
}
|
|
33
33
|
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
# Sample Hardhat 3 Beta Project (minimal)
|
|
2
|
+
|
|
3
|
+
This project has a minimal setup of Hardhat 3 Beta, without any plugins.
|
|
4
|
+
|
|
5
|
+
## What's included?
|
|
6
|
+
|
|
7
|
+
The project includes native support for TypeScript, Hardhat scripts, tasks, and support for Solidity compilation and tests.
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
# Node modules
|
|
2
|
+
/node_modules
|
|
3
|
+
|
|
4
|
+
# Compilation output
|
|
5
|
+
/dist
|
|
6
|
+
|
|
7
|
+
# pnpm deploy output
|
|
8
|
+
/bundle
|
|
9
|
+
|
|
10
|
+
# Hardhat Build Artifacts
|
|
11
|
+
/artifacts
|
|
12
|
+
|
|
13
|
+
# Hardhat compilation (v2) support directory
|
|
14
|
+
/cache
|
|
15
|
+
|
|
16
|
+
# Typechain output
|
|
17
|
+
/types
|
|
18
|
+
|
|
19
|
+
# Hardhat coverage reports
|
|
20
|
+
/coverage
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "template-minimal",
|
|
3
|
+
"private": true,
|
|
4
|
+
"version": "0.0.1",
|
|
5
|
+
"description": "A minimal Hardhat project",
|
|
6
|
+
"type": "module",
|
|
7
|
+
"devDependencies": {
|
|
8
|
+
"hardhat": "workspace:^3.0.13",
|
|
9
|
+
"@types/node": "^22.8.5",
|
|
10
|
+
"typescript": "~5.8.0"
|
|
11
|
+
}
|
|
12
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/* Based on https://github.com/tsconfig/bases/blob/501da2bcd640cf95c95805783e1012b992338f28/bases/node22.json */
|
|
2
|
+
{
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"lib": ["es2023"],
|
|
5
|
+
"module": "node16",
|
|
6
|
+
"target": "es2022",
|
|
7
|
+
"strict": true,
|
|
8
|
+
"esModuleInterop": true,
|
|
9
|
+
"skipLibCheck": true,
|
|
10
|
+
"moduleResolution": "node16",
|
|
11
|
+
"outDir": "dist"
|
|
12
|
+
}
|
|
13
|
+
}
|