hardhat 3.1.11 → 3.2.0
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 +31 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers.d.ts +5 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/helpers.js +12 -0
- package/dist/src/internal/builtin-plugins/coverage/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/hre.js +2 -5
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/hre.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.js +3 -5
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/solidity.js.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.js +4 -15
- package/dist/src/internal/builtin-plugins/coverage/hook-handlers/test.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.d.ts +53 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.js +288 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.js.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.d.ts +11 -11
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.js +82 -27
- package/dist/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.d.ts +10 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.js +27 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.js +4 -5
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.js +13 -17
- package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/index.js +42 -2
- package/dist/src/internal/builtin-plugins/gas-analytics/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts +45 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js +276 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts +22 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js +88 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js.map +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/type-extensions.d.ts +1 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/type-extensions.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/gas-analytics/types.d.ts +33 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/types.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/index.js +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.js +15 -1
- package/dist/src/internal/builtin-plugins/network-manager/network-manager.js.map +1 -1
- package/dist/src/internal/builtin-plugins/node/json-rpc/handler.js +7 -2
- package/dist/src/internal/builtin-plugins/node/json-rpc/handler.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js +0 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/index.d.ts +10 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/index.js +29 -6
- package/dist/src/internal/builtin-plugins/solidity/build-system/compiler/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.d.ts +6 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.js +11 -0
- package/dist/src/internal/builtin-plugins/solidity/build-system/solc-info.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/config.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity/config.js +13 -7
- package/dist/src/internal/builtin-plugins/solidity/config.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts +3 -1
- package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/config.js +9 -0
- package/dist/src/internal/builtin-plugins/solidity-test/config.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.js +4 -10
- package/dist/src/internal/builtin-plugins/solidity-test/helpers.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.js +0 -1
- package/dist/src/internal/builtin-plugins/solidity-test/index.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/runner.d.ts +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/runner.d.ts.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/runner.js +2 -2
- package/dist/src/internal/builtin-plugins/solidity-test/runner.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts +5 -0
- 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 +19 -11
- package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
- package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts +15 -10
- package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts.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 +60 -21
- package/dist/src/internal/builtin-plugins/test/task-action.js.map +1 -1
- package/dist/src/types/network.d.ts +1 -1
- package/dist/src/types/network.d.ts.map +1 -1
- package/dist/src/types/test.d.ts +7 -0
- package/dist/src/types/test.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/internal/builtin-plugins/coverage/helpers.ts +31 -0
- package/src/internal/builtin-plugins/coverage/hook-handlers/hre.ts +2 -10
- package/src/internal/builtin-plugins/coverage/hook-handlers/solidity.ts +3 -12
- package/src/internal/builtin-plugins/coverage/hook-handlers/test.ts +4 -25
- package/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.ts +473 -0
- package/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.ts +121 -35
- package/src/internal/builtin-plugins/gas-analytics/helpers.ts +60 -0
- package/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts +6 -10
- package/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.ts +18 -26
- package/src/internal/builtin-plugins/gas-analytics/index.ts +44 -2
- package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts +454 -0
- package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts +172 -0
- package/src/internal/builtin-plugins/gas-analytics/type-extensions.ts +1 -0
- package/src/internal/builtin-plugins/gas-analytics/types.ts +37 -0
- package/src/internal/builtin-plugins/index.ts +1 -1
- package/src/internal/builtin-plugins/network-manager/network-manager.ts +29 -2
- package/src/internal/builtin-plugins/node/json-rpc/handler.ts +8 -2
- package/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts +0 -5
- package/src/internal/builtin-plugins/solidity/build-system/compiler/index.ts +44 -9
- package/src/internal/builtin-plugins/solidity/build-system/solc-info.ts +15 -0
- package/src/internal/builtin-plugins/solidity/config.ts +13 -6
- package/src/internal/builtin-plugins/solidity-test/config.ts +15 -0
- package/src/internal/builtin-plugins/solidity-test/helpers.ts +6 -14
- package/src/internal/builtin-plugins/solidity-test/index.ts +0 -1
- package/src/internal/builtin-plugins/solidity-test/runner.ts +2 -2
- package/src/internal/builtin-plugins/solidity-test/task-action.ts +27 -21
- package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +17 -10
- package/src/internal/builtin-plugins/test/task-action.ts +74 -36
- package/src/types/network.ts +2 -2
- package/src/types/test.ts +8 -0
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +5 -5
- package/templates/hardhat-3/02-mocha-ethers/package.json +6 -6
- package/templates/hardhat-3/03-minimal/package.json +1 -1
|
@@ -0,0 +1,276 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { HardhatError } from "@nomicfoundation/hardhat-errors";
|
|
3
|
+
import { ensureError } from "@nomicfoundation/hardhat-utils/error";
|
|
4
|
+
import { FileNotFoundError, readdir, readJsonFile, remove, writeJsonFile, } from "@nomicfoundation/hardhat-utils/fs";
|
|
5
|
+
import chalk from "chalk";
|
|
6
|
+
import { getFullyQualifiedName, parseFullyQualifiedName, } from "../../../utils/contract-names.js";
|
|
7
|
+
import { getUserFqn } from "./gas-analytics-manager.js";
|
|
8
|
+
import { formatSectionHeader } from "./helpers.js";
|
|
9
|
+
export const SNAPSHOT_CHEATCODES_DIR = "snapshots";
|
|
10
|
+
export function getSnapshotCheatcodesPath(basePath, filename) {
|
|
11
|
+
return path.join(basePath, SNAPSHOT_CHEATCODES_DIR, filename);
|
|
12
|
+
}
|
|
13
|
+
export function extractSnapshotCheatcodes(suiteResults) {
|
|
14
|
+
const snapshots = new Map();
|
|
15
|
+
for (const { id: suiteId, testResults } of suiteResults) {
|
|
16
|
+
for (const { valueSnapshotGroups: snapshotGroups } of testResults) {
|
|
17
|
+
if (snapshotGroups === undefined) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const userFqn = getUserFqn(getFullyQualifiedName(suiteId.source, suiteId.name));
|
|
21
|
+
for (const group of snapshotGroups) {
|
|
22
|
+
let snapshot = snapshots.get(group.name);
|
|
23
|
+
if (snapshot === undefined) {
|
|
24
|
+
snapshot = {};
|
|
25
|
+
snapshots.set(group.name, snapshot);
|
|
26
|
+
}
|
|
27
|
+
for (const entry of group.entries) {
|
|
28
|
+
snapshot[entry.name] = {
|
|
29
|
+
value: entry.value,
|
|
30
|
+
metadata: {
|
|
31
|
+
source: parseFullyQualifiedName(userFqn).sourceName,
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return snapshots;
|
|
39
|
+
}
|
|
40
|
+
async function deleteOrphanedSnapshotFiles(snapshotsDir, currentGroups) {
|
|
41
|
+
let dirEntries;
|
|
42
|
+
try {
|
|
43
|
+
dirEntries = await readdir(snapshotsDir);
|
|
44
|
+
for (const entry of dirEntries) {
|
|
45
|
+
if (entry.endsWith(".json")) {
|
|
46
|
+
const groupName = entry.slice(0, -5); // remove .json
|
|
47
|
+
if (!currentGroups.has(groupName)) {
|
|
48
|
+
const filePath = path.join(snapshotsDir, entry);
|
|
49
|
+
await remove(filePath);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
ensureError(error);
|
|
56
|
+
// Directory doesn't exist yet, nothing to clean up
|
|
57
|
+
if (error instanceof FileNotFoundError) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.SNAPSHOT_WRITE_ERROR, { snapshotsPath: snapshotsDir, error: error.message }, error);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
export async function writeSnapshotCheatcodes(basePath, snapshotCheatcodes) {
|
|
64
|
+
const snapshotsDir = path.join(basePath, SNAPSHOT_CHEATCODES_DIR);
|
|
65
|
+
// Delete old files that are no longer in the map
|
|
66
|
+
const currentGroups = new Set(snapshotCheatcodes.keys());
|
|
67
|
+
await deleteOrphanedSnapshotFiles(snapshotsDir, currentGroups);
|
|
68
|
+
// Write current snapshot files
|
|
69
|
+
for (const [snapshotGroup, snapshot] of snapshotCheatcodes) {
|
|
70
|
+
const snapshotCheatcodesPath = getSnapshotCheatcodesPath(basePath, `${snapshotGroup}.json`);
|
|
71
|
+
const snapshotWithoutMetadata = {};
|
|
72
|
+
for (const [name, entry] of Object.entries(snapshot)) {
|
|
73
|
+
snapshotWithoutMetadata[name] = entry.value;
|
|
74
|
+
}
|
|
75
|
+
try {
|
|
76
|
+
await writeJsonFile(snapshotCheatcodesPath, snapshotWithoutMetadata);
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
ensureError(error);
|
|
80
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.SNAPSHOT_WRITE_ERROR, { snapshotsPath: snapshotCheatcodesPath, error: error.message }, error);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
export async function readSnapshotCheatcodes(basePath) {
|
|
85
|
+
const snapshots = new Map();
|
|
86
|
+
const snapshotsDir = path.join(basePath, SNAPSHOT_CHEATCODES_DIR);
|
|
87
|
+
let dirEntries;
|
|
88
|
+
try {
|
|
89
|
+
dirEntries = await readdir(snapshotsDir);
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
ensureError(error);
|
|
93
|
+
// Re-throw as-is to allow the caller to handle this case specifically
|
|
94
|
+
if (error instanceof FileNotFoundError) {
|
|
95
|
+
throw error;
|
|
96
|
+
}
|
|
97
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.SNAPSHOT_READ_ERROR, { snapshotsPath: snapshotsDir, error: error.message }, error);
|
|
98
|
+
}
|
|
99
|
+
for (const entry of dirEntries) {
|
|
100
|
+
if (entry.endsWith(".json")) {
|
|
101
|
+
const snapshotGroup = entry.slice(0, -5); // remove .json extension
|
|
102
|
+
const snapshotCheatcodesPath = getSnapshotCheatcodesPath(basePath, entry);
|
|
103
|
+
let snapshot;
|
|
104
|
+
try {
|
|
105
|
+
snapshot = await readJsonFile(snapshotCheatcodesPath);
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
ensureError(error);
|
|
109
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.SNAPSHOT_READ_ERROR, { snapshotsPath: snapshotCheatcodesPath, error: error.message }, error);
|
|
110
|
+
}
|
|
111
|
+
snapshots.set(snapshotGroup, snapshot);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return snapshots;
|
|
115
|
+
}
|
|
116
|
+
export function stringifySnapshotCheatcodes(snapshots) {
|
|
117
|
+
const lines = [];
|
|
118
|
+
for (const { group, name, value } of snapshots) {
|
|
119
|
+
lines.push(`${group}#${name}: ${value}`);
|
|
120
|
+
}
|
|
121
|
+
return lines.sort((a, b) => a.localeCompare(b)).join("\n");
|
|
122
|
+
}
|
|
123
|
+
export function compareSnapshotCheatcodes(previousSnapshotsMap, currentSnapshotsMap) {
|
|
124
|
+
const added = [];
|
|
125
|
+
const removed = [];
|
|
126
|
+
const changed = [];
|
|
127
|
+
const seenPreviousEntries = new Set();
|
|
128
|
+
for (const [group, currentSnapshots] of currentSnapshotsMap) {
|
|
129
|
+
const previousSnapshots = previousSnapshotsMap.get(group);
|
|
130
|
+
for (const [name, currentEntry] of Object.entries(currentSnapshots)) {
|
|
131
|
+
const key = `${group}#${name}`;
|
|
132
|
+
if (previousSnapshots === undefined ||
|
|
133
|
+
!Object.hasOwn(previousSnapshots, name)) {
|
|
134
|
+
added.push({ group, name, value: currentEntry.value });
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
seenPreviousEntries.add(key);
|
|
138
|
+
const previousValue = previousSnapshots[name];
|
|
139
|
+
if (previousValue !== currentEntry.value) {
|
|
140
|
+
changed.push({
|
|
141
|
+
group,
|
|
142
|
+
name,
|
|
143
|
+
expected: Number(previousValue),
|
|
144
|
+
actual: Number(currentEntry.value),
|
|
145
|
+
source: currentEntry.metadata.source,
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
for (const [group, previousSnapshots] of previousSnapshotsMap) {
|
|
152
|
+
for (const [name, previousValue] of Object.entries(previousSnapshots)) {
|
|
153
|
+
const key = `${group}#${name}`;
|
|
154
|
+
if (!seenPreviousEntries.has(key)) {
|
|
155
|
+
removed.push({ group, name, value: previousValue });
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
const sortByKey = (a, b) => `${a.group}#${a.name}`.localeCompare(`${b.group}#${b.name}`);
|
|
160
|
+
// Sort the results for consistent output
|
|
161
|
+
return {
|
|
162
|
+
added: added.sort(sortByKey),
|
|
163
|
+
removed: removed.sort(sortByKey),
|
|
164
|
+
changed: changed.sort(sortByKey),
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
export async function checkSnapshotCheatcodes(basePath, suiteResults) {
|
|
168
|
+
const snapshotCheatcodes = extractSnapshotCheatcodes(suiteResults);
|
|
169
|
+
let previousSnapshotCheatcodes;
|
|
170
|
+
try {
|
|
171
|
+
previousSnapshotCheatcodes = await readSnapshotCheatcodes(basePath);
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
if (error instanceof FileNotFoundError) {
|
|
175
|
+
// Only write if there are cheatcodes to save
|
|
176
|
+
const written = snapshotCheatcodes.size > 0;
|
|
177
|
+
if (written) {
|
|
178
|
+
await writeSnapshotCheatcodes(basePath, snapshotCheatcodes);
|
|
179
|
+
}
|
|
180
|
+
return {
|
|
181
|
+
passed: true,
|
|
182
|
+
comparison: {
|
|
183
|
+
added: [],
|
|
184
|
+
removed: [],
|
|
185
|
+
changed: [],
|
|
186
|
+
},
|
|
187
|
+
written,
|
|
188
|
+
};
|
|
189
|
+
}
|
|
190
|
+
throw error;
|
|
191
|
+
}
|
|
192
|
+
const comparison = compareSnapshotCheatcodes(previousSnapshotCheatcodes, snapshotCheatcodes);
|
|
193
|
+
// Update snapshots when functions are added or removed (but not changed)
|
|
194
|
+
const hasAddedOrRemoved = comparison.added.length > 0 || comparison.removed.length > 0;
|
|
195
|
+
if (comparison.changed.length === 0 && hasAddedOrRemoved) {
|
|
196
|
+
await writeSnapshotCheatcodes(basePath, snapshotCheatcodes);
|
|
197
|
+
}
|
|
198
|
+
return {
|
|
199
|
+
passed: comparison.changed.length === 0,
|
|
200
|
+
comparison,
|
|
201
|
+
written: hasAddedOrRemoved,
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
export function logSnapshotCheatcodesSection(result, logger = console.log) {
|
|
205
|
+
const { comparison, written } = result;
|
|
206
|
+
const changedLength = comparison.changed.length;
|
|
207
|
+
const addedLength = comparison.added.length;
|
|
208
|
+
const removedLength = comparison.removed.length;
|
|
209
|
+
const hasChanges = changedLength > 0;
|
|
210
|
+
const hasAdded = addedLength > 0;
|
|
211
|
+
const hasRemoved = removedLength > 0;
|
|
212
|
+
const hasAnyDifferences = hasChanges || hasAdded || hasRemoved;
|
|
213
|
+
const isFirstTimeWrite = written && !hasAnyDifferences;
|
|
214
|
+
// Nothing to report
|
|
215
|
+
if (!isFirstTimeWrite && !hasAnyDifferences) {
|
|
216
|
+
return;
|
|
217
|
+
}
|
|
218
|
+
logger(formatSectionHeader("Snapshot cheatcodes", {
|
|
219
|
+
changedLength,
|
|
220
|
+
addedLength,
|
|
221
|
+
removedLength,
|
|
222
|
+
}));
|
|
223
|
+
if (isFirstTimeWrite) {
|
|
224
|
+
logger();
|
|
225
|
+
logger(chalk.green(" No existing snapshots found. Snapshot cheatcodes written successfully"));
|
|
226
|
+
logger();
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
if (hasChanges) {
|
|
230
|
+
logger();
|
|
231
|
+
printSnapshotCheatcodeChanges(comparison.changed, logger);
|
|
232
|
+
}
|
|
233
|
+
if (hasAdded) {
|
|
234
|
+
logger();
|
|
235
|
+
logger(` Added ${comparison.added.length} snapshot(s):`);
|
|
236
|
+
const addedLines = stringifySnapshotCheatcodes(comparison.added).split("\n");
|
|
237
|
+
for (const line of addedLines) {
|
|
238
|
+
logger(chalk.green(` + ${line}`));
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
if (hasRemoved) {
|
|
242
|
+
logger();
|
|
243
|
+
logger(` Removed ${comparison.removed.length} snapshot(s):`);
|
|
244
|
+
const removedLines = stringifySnapshotCheatcodes(comparison.removed).split("\n");
|
|
245
|
+
for (const line of removedLines) {
|
|
246
|
+
logger(chalk.red(` - ${line}`));
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
logger();
|
|
250
|
+
}
|
|
251
|
+
export function printSnapshotCheatcodeChanges(changes, logger = console.log) {
|
|
252
|
+
for (let i = 0; i < changes.length; i++) {
|
|
253
|
+
const change = changes[i];
|
|
254
|
+
const isLast = i === changes.length - 1;
|
|
255
|
+
logger(` ${change.group}#${change.name}`);
|
|
256
|
+
logger(chalk.grey(` (in ${change.source})`));
|
|
257
|
+
const diff = change.actual - change.expected;
|
|
258
|
+
const formattedDiff = diff > 0 ? `Δ+${diff}` : `Δ${diff}`;
|
|
259
|
+
let gasChange = `${formattedDiff}`;
|
|
260
|
+
if (change.expected > 0) {
|
|
261
|
+
const percent = (diff / change.expected) * 100;
|
|
262
|
+
const formattedPercent = percent >= 0 ? `+${percent.toFixed(2)}%` : `${percent.toFixed(2)}%`;
|
|
263
|
+
gasChange = `${formattedPercent}, ${formattedDiff}`;
|
|
264
|
+
}
|
|
265
|
+
// Color: green for decrease (improvement), red for increase (regression)
|
|
266
|
+
const formattedGasChange = diff < 0 ? chalk.green(gasChange) : chalk.red(gasChange);
|
|
267
|
+
logger(chalk.grey(` Expected: ${change.expected}`));
|
|
268
|
+
logger(chalk.grey(` Actual: ${change.actual} (`) +
|
|
269
|
+
formattedGasChange +
|
|
270
|
+
chalk.grey(")"));
|
|
271
|
+
if (!isLast) {
|
|
272
|
+
logger();
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
//# sourceMappingURL=snapshot-cheatcodes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"snapshot-cheatcodes.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { TaskOverrideActionFunction } from "../../../../../types/tasks.js";
|
|
2
|
+
import type { FunctionGasSnapshotCheckResult } from "../../function-gas-snapshots.js";
|
|
3
|
+
import type { SnapshotCheatcodesCheckResult } from "../../snapshot-cheatcodes.js";
|
|
4
|
+
import type { SuiteResult } from "@nomicfoundation/edr";
|
|
5
|
+
interface GasAnalyticsTestActionArguments {
|
|
6
|
+
snapshot: boolean;
|
|
7
|
+
snapshotCheck: boolean;
|
|
8
|
+
}
|
|
9
|
+
export interface SnapshotResult {
|
|
10
|
+
functionGasSnapshotsWritten: boolean;
|
|
11
|
+
}
|
|
12
|
+
export interface SnapshotCheckResult {
|
|
13
|
+
functionGasSnapshotsCheck: FunctionGasSnapshotCheckResult;
|
|
14
|
+
snapshotCheatcodesCheck: SnapshotCheatcodesCheckResult;
|
|
15
|
+
}
|
|
16
|
+
declare const runSolidityTests: TaskOverrideActionFunction<GasAnalyticsTestActionArguments>;
|
|
17
|
+
export declare function handleSnapshot(basePath: string, suiteResults: SuiteResult[], testsPassed: boolean): Promise<SnapshotResult>;
|
|
18
|
+
export declare function logSnapshotResult(result: SnapshotResult, logger?: typeof console.log): void;
|
|
19
|
+
export declare function handleSnapshotCheck(basePath: string, suiteResults: SuiteResult[]): Promise<SnapshotCheckResult>;
|
|
20
|
+
export declare function logSnapshotCheckResult({ functionGasSnapshotsCheck, snapshotCheatcodesCheck }: SnapshotCheckResult, logger?: typeof console.log): void;
|
|
21
|
+
export default runSolidityTests;
|
|
22
|
+
//# sourceMappingURL=task-action.d.ts.map
|
package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-action.d.ts","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAGhF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAmBxD,UAAU,+BAA+B;IACvC,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,2BAA2B,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,mBAAmB;IAClC,yBAAyB,EAAE,8BAA8B,CAAC;IAC1D,uBAAuB,EAAE,6BAA6B,CAAC;CACxD;AAED,QAAA,MAAM,gBAAgB,EAAE,0BAA0B,CAChD,+BAA+B,CAyChC,CAAC;AAEF,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,EAC3B,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,cAAc,CAAC,CAYzB;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,GAAE,OAAO,OAAO,CAAC,GAAiB,GACvC,IAAI,CAKN;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,GAC1B,OAAO,CAAC,mBAAmB,CAAC,CAc9B;AAED,wBAAgB,sBAAsB,CACpC,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,EAAE,mBAAmB,EAC3E,MAAM,GAAE,OAAO,OAAO,CAAC,GAAiB,GACvC,IAAI,CAqCN;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { HardhatError } from "@nomicfoundation/hardhat-errors";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
import { errorResult } from "../../../../../utils/result.js";
|
|
4
|
+
import { checkFunctionGasSnapshots, extractFunctionGasSnapshots, logFunctionGasSnapshotsSection, writeFunctionGasSnapshots, } from "../../function-gas-snapshots.js";
|
|
5
|
+
import { checkSnapshotCheatcodes, extractSnapshotCheatcodes, logSnapshotCheatcodesSection, writeSnapshotCheatcodes, } from "../../snapshot-cheatcodes.js";
|
|
6
|
+
const runSolidityTests = async (args, hre, runSuper) => {
|
|
7
|
+
const superResult = await runSuper(args);
|
|
8
|
+
const testsPassed = superResult.success;
|
|
9
|
+
const solidityTestRunResult = testsPassed
|
|
10
|
+
? superResult.value
|
|
11
|
+
: superResult.error;
|
|
12
|
+
const suiteResults = solidityTestRunResult.suiteResults;
|
|
13
|
+
const rootPath = hre.config.paths.root;
|
|
14
|
+
if (args.snapshot && args.snapshotCheck) {
|
|
15
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.MUTUALLY_EXCLUSIVE_SNAPSHOT_FLAGS);
|
|
16
|
+
}
|
|
17
|
+
let snapshotCheckPassed = true;
|
|
18
|
+
if (args.snapshot) {
|
|
19
|
+
const snapshotResult = await handleSnapshot(rootPath, suiteResults, testsPassed);
|
|
20
|
+
logSnapshotResult(snapshotResult);
|
|
21
|
+
}
|
|
22
|
+
else if (testsPassed && args.snapshotCheck) {
|
|
23
|
+
const snapshotCheckResult = await handleSnapshotCheck(rootPath, suiteResults);
|
|
24
|
+
logSnapshotCheckResult(snapshotCheckResult);
|
|
25
|
+
snapshotCheckPassed =
|
|
26
|
+
snapshotCheckResult.functionGasSnapshotsCheck.passed &&
|
|
27
|
+
snapshotCheckResult.snapshotCheatcodesCheck.passed;
|
|
28
|
+
}
|
|
29
|
+
if (!snapshotCheckPassed) {
|
|
30
|
+
return errorResult(solidityTestRunResult);
|
|
31
|
+
}
|
|
32
|
+
return superResult;
|
|
33
|
+
};
|
|
34
|
+
export async function handleSnapshot(basePath, suiteResults, testsPassed) {
|
|
35
|
+
if (testsPassed) {
|
|
36
|
+
const functionGasSnapshots = extractFunctionGasSnapshots(suiteResults);
|
|
37
|
+
await writeFunctionGasSnapshots(basePath, functionGasSnapshots);
|
|
38
|
+
}
|
|
39
|
+
const snapshotCheatcodes = extractSnapshotCheatcodes(suiteResults);
|
|
40
|
+
await writeSnapshotCheatcodes(basePath, snapshotCheatcodes);
|
|
41
|
+
return {
|
|
42
|
+
functionGasSnapshotsWritten: testsPassed,
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
export function logSnapshotResult(result, logger = console.log) {
|
|
46
|
+
if (result.functionGasSnapshotsWritten) {
|
|
47
|
+
logger(chalk.green("Function gas snapshots written successfully"));
|
|
48
|
+
logger();
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
export async function handleSnapshotCheck(basePath, suiteResults) {
|
|
52
|
+
const functionGasSnapshotsCheck = await checkFunctionGasSnapshots(basePath, suiteResults);
|
|
53
|
+
const snapshotCheatcodesCheck = await checkSnapshotCheatcodes(basePath, suiteResults);
|
|
54
|
+
return {
|
|
55
|
+
functionGasSnapshotsCheck,
|
|
56
|
+
snapshotCheatcodesCheck,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
export function logSnapshotCheckResult({ functionGasSnapshotsCheck, snapshotCheatcodesCheck }, logger = console.log) {
|
|
60
|
+
logger(functionGasSnapshotsCheck.passed && snapshotCheatcodesCheck.passed
|
|
61
|
+
? chalk.green("Snapshot check passed")
|
|
62
|
+
: chalk.red("Snapshot check failed"));
|
|
63
|
+
const functionGasHasOutput = functionGasSnapshotsCheck.written ||
|
|
64
|
+
functionGasSnapshotsCheck.comparison.changed.length > 0 ||
|
|
65
|
+
functionGasSnapshotsCheck.comparison.added.length > 0 ||
|
|
66
|
+
functionGasSnapshotsCheck.comparison.removed.length > 0;
|
|
67
|
+
const snapshotCheatcodesHasOutput = snapshotCheatcodesCheck.written ||
|
|
68
|
+
snapshotCheatcodesCheck.comparison.changed.length > 0 ||
|
|
69
|
+
snapshotCheatcodesCheck.comparison.added.length > 0 ||
|
|
70
|
+
snapshotCheatcodesCheck.comparison.removed.length > 0;
|
|
71
|
+
// Add an extra newline if function gas snapshots have output
|
|
72
|
+
if (functionGasHasOutput) {
|
|
73
|
+
logger();
|
|
74
|
+
}
|
|
75
|
+
logFunctionGasSnapshotsSection(functionGasSnapshotsCheck, logger);
|
|
76
|
+
// Add an extra newline if only snapshot cheatcodes have output
|
|
77
|
+
// (logFunctionGasSnapshotsSection adds one if it has output)
|
|
78
|
+
if (!functionGasHasOutput && snapshotCheatcodesHasOutput) {
|
|
79
|
+
logger();
|
|
80
|
+
}
|
|
81
|
+
logSnapshotCheatcodesSection(snapshotCheatcodesCheck, logger);
|
|
82
|
+
if (!functionGasSnapshotsCheck.passed || !snapshotCheatcodesCheck.passed) {
|
|
83
|
+
logger(chalk.yellow("To update snapshots, run your tests with --snapshot"));
|
|
84
|
+
logger();
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
export default runSolidityTests;
|
|
88
|
+
//# sourceMappingURL=task-action.js.map
|
package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../../../src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/type-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAiB,aAAa;QAC5B,QAAQ,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/type-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAiB,aAAa;QAC5B,QAAQ,EAAE,OAAO,CAAC;QAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;CACF"}
|
|
@@ -1,3 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Gas statistics for a single function call or deployment (min/max/avg/median/count).
|
|
3
|
+
*/
|
|
4
|
+
export interface GasStatsJsonEntry {
|
|
5
|
+
min: number;
|
|
6
|
+
max: number;
|
|
7
|
+
avg: number;
|
|
8
|
+
median: number;
|
|
9
|
+
count: number;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Gas statistics for a single contract in the JSON output.
|
|
13
|
+
* `deployment` is null when the contract was never deployed during the test run
|
|
14
|
+
* (e.g. deployed by a factory or via forking). `functions` is null when the
|
|
15
|
+
* contract was deployed but no functions were called.
|
|
16
|
+
*/
|
|
17
|
+
export interface ContractGasStatsJson {
|
|
18
|
+
sourceName: string;
|
|
19
|
+
contractName: string;
|
|
20
|
+
deployment: GasStatsJsonEntry | null;
|
|
21
|
+
functions: Record<string, GasStatsJsonEntry> | null;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Top-level JSON output shape produced by `--gas-stats-json`.
|
|
25
|
+
* Contract keys are user-friendly FQNs (e.g. `contracts/Foo.sol:Foo`),
|
|
26
|
+
* sorted alphabetically.
|
|
27
|
+
*/
|
|
28
|
+
export interface GasStatsJson {
|
|
29
|
+
contracts: Record<string, ContractGasStatsJson>;
|
|
30
|
+
}
|
|
1
31
|
interface BaseGasMeasurement {
|
|
2
32
|
contractFqn: string;
|
|
3
33
|
gas: number;
|
|
@@ -16,6 +46,9 @@ export interface GasAnalyticsManager {
|
|
|
16
46
|
clearGasMeasurements(id: string): Promise<void>;
|
|
17
47
|
saveGasMeasurements(id: string): Promise<void>;
|
|
18
48
|
reportGasStats(...ids: string[]): Promise<void>;
|
|
49
|
+
writeGasStatsJson(outputPath: string, ...ids: string[]): Promise<void>;
|
|
50
|
+
enableReport(): void;
|
|
51
|
+
disableReport(): void;
|
|
19
52
|
}
|
|
20
53
|
export {};
|
|
21
54
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/types.ts"],"names":[],"mappings":"AAAA,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,sBAAuB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,wBAAyB,SAAQ,kBAAkB;IAC3D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,wBAAwB,CAAC;AAE/E,MAAM,WAAW,mBAAmB;IAElC,iBAAiB,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACxD,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAC;CACrD;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CACjD;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,sBAAuB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,wBAAyB,SAAQ,kBAAkB;IAC3D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,wBAAwB,CAAC;AAE/E,MAAM,WAAW,mBAAmB;IAElC,iBAAiB,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACxD,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE,YAAY,IAAI,IAAI,CAAC;IACrB,aAAa,IAAI,IAAI,CAAC;CACvB"}
|
|
@@ -8,6 +8,6 @@ export declare class NetworkManagerImplementation implements NetworkManager {
|
|
|
8
8
|
#private;
|
|
9
9
|
constructor(defaultNetwork: string, defaultChainType: DefaultChainType, networkConfigs: Record<string, NetworkConfig>, hookManager: HookManager, artifactsManager: ArtifactManager, userConfig: HardhatUserConfig, chainDescriptors: ChainDescriptorsConfig, userProvidedConfigPath: string | undefined, projectRoot: string);
|
|
10
10
|
connect<ChainTypeT extends ChainType | string = DefaultChainType>(networkOrParams?: NetworkConnectionParams<ChainTypeT> | string): Promise<NetworkConnection<ChainTypeT>>;
|
|
11
|
-
createServer(networkOrParams?: NetworkConnectionParams | string, _hostname?: string, port?: number): Promise<JsonRpcServer>;
|
|
11
|
+
createServer<ChainTypeT extends ChainType | string = DefaultChainType>(networkOrParams?: NetworkConnectionParams<ChainTypeT> | string, _hostname?: string, port?: number): Promise<JsonRpcServer>;
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=network-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EACV,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAEV,cAAc,EACd,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAoBrC,MAAM,MAAM,6BAA6B,GAAG,CAC1C,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,eAAe,CAAC,KAC7D,OAAO,CAAC,eAAe,CAAC,CAAC;AAE9B,qBAAa,4BAA6B,YAAW,cAAc;;gBAc/D,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAC7C,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,eAAe,EACjC,UAAU,EAAE,iBAAiB,EAC7B,gBAAgB,EAAE,sBAAsB,EACxC,sBAAsB,EAAE,MAAM,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM;IAaR,OAAO,CAClB,UAAU,SAAS,SAAS,GAAG,MAAM,GAAG,gBAAgB,EAExD,eAAe,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,GAAG,MAAM,GAC7D,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IA0B5B,YAAY,CACvB,eAAe,
|
|
1
|
+
{"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EACV,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAEV,cAAc,EACd,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAoBrC,MAAM,MAAM,6BAA6B,GAAG,CAC1C,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,eAAe,CAAC,KAC7D,OAAO,CAAC,eAAe,CAAC,CAAC;AAE9B,qBAAa,4BAA6B,YAAW,cAAc;;gBAc/D,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAC7C,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,eAAe,EACjC,UAAU,EAAE,iBAAiB,EAC7B,gBAAgB,EAAE,sBAAsB,EACxC,sBAAsB,EAAE,MAAM,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM;IAaR,OAAO,CAClB,UAAU,SAAS,SAAS,GAAG,MAAM,GAAG,gBAAgB,EAExD,eAAe,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,GAAG,MAAM,GAC7D,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IA0B5B,YAAY,CACvB,UAAU,SAAS,SAAS,GAAG,MAAM,GAAG,gBAAgB,EAExD,eAAe,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,GAAG,MAAM,EAC9D,SAAS,CAAC,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,CAAC;CAyV1B"}
|
|
@@ -48,7 +48,8 @@ export class NetworkManagerImplementation {
|
|
|
48
48
|
-- Cast to NetworkConnection<ChainTypeT> because we know it's valid */
|
|
49
49
|
return networkConnection;
|
|
50
50
|
}
|
|
51
|
-
async createServer(networkOrParams
|
|
51
|
+
async createServer(networkOrParams, _hostname, port) {
|
|
52
|
+
this.#ensureNetworkOrParamsIsNotHttpNetworkConfig(networkOrParams);
|
|
52
53
|
const insideDocker = await exists("/.dockerenv");
|
|
53
54
|
const hostname = _hostname ?? (insideDocker ? "0.0.0.0" : "127.0.0.1");
|
|
54
55
|
const { provider } = await this.connect(networkOrParams);
|
|
@@ -242,5 +243,18 @@ export class NetworkManagerImplementation {
|
|
|
242
243
|
}
|
|
243
244
|
return path;
|
|
244
245
|
}
|
|
246
|
+
#ensureNetworkOrParamsIsNotHttpNetworkConfig(networkOrParams) {
|
|
247
|
+
const networkName = typeof networkOrParams === "string"
|
|
248
|
+
? networkOrParams
|
|
249
|
+
: networkOrParams?.network ?? this.#defaultNetwork;
|
|
250
|
+
const networkConfig = this.#networkConfigs[networkName];
|
|
251
|
+
if (networkConfig === undefined || networkConfig.type === "edr-simulated") {
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
throw new HardhatError(HardhatError.ERRORS.CORE.NETWORK.CREATE_SERVER_UNSUPPORTED_NETWORK_TYPE, {
|
|
255
|
+
networkName,
|
|
256
|
+
networkType: networkConfig.type,
|
|
257
|
+
});
|
|
258
|
+
}
|
|
245
259
|
}
|
|
246
260
|
//# sourceMappingURL=network-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-manager.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,YAAY,EACZ,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,OAAO,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAO1E,MAAM,OAAO,4BAA4B;IAC9B,eAAe,CAAS;IACxB,iBAAiB,CAAmB;IACpC,eAAe,CAAoD;IACnE,YAAY,CAAwB;IACpC,iBAAiB,CAA4B;IAC7C,WAAW,CAA8B;IACzC,iBAAiB,CAAmC;IACpD,uBAAuB,CAA+B;IACtD,YAAY,CAAS;IAE9B,iBAAiB,GAAG,CAAC,CAAC;IAEtB,YACE,cAAsB,EACtB,gBAAkC,EAClC,cAA6C,EAC7C,WAAwB,EACxB,gBAAiC,EACjC,UAA6B,EAC7B,gBAAwC,EACxC,sBAA0C,EAC1C,WAAmB;QAEnB,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACtC,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,uBAAuB,GAAG,sBAAsB,CAAC;QACtD,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,OAAO,CAGlB,eAA8D;QAE9D,IAAI,WAA+B,CAAC;QACpC,IAAI,SAAiC,CAAC;QACtC,IAAI,QAA2C,CAAC;QAEhD,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;YACxC,WAAW,GAAG,eAAe,CAAC;QAChC,CAAC;aAAM,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YACzC,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC;YACtC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;YACtC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;QACtC,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAC/D,SAAS,EACT,eAAe,EACf,EAAE,EACF,KAAK,EAAE,QAAQ,EAAE,EAAE,CACjB,IAAI,CAAC,4BAA4B,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CACtE,CAAC;QAEF;8EACsE;QACtE,OAAO,iBAAkD,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"network-manager.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/network-manager/network-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,6 +180,11 @@ const _readWsRequest = (msg) => {
|
|
|
180
180
|
return json;
|
|
181
181
|
};
|
|
182
182
|
const _handleError = (error) => {
|
|
183
|
+
// Extract revert data from the original error before potentially wrapping it.
|
|
184
|
+
// Non-ProviderError errors (e.g. SolidityError) carry .data and .transactionHash
|
|
185
|
+
// that would be lost when wrapped in InternalError below.
|
|
186
|
+
const txHash = extractTxHash(error);
|
|
187
|
+
const returnData = extractReturnData(error);
|
|
183
188
|
// In case of non-hardhat error, treat it as internal and associate the appropriate error code.
|
|
184
189
|
if (!ProviderError.isProviderError(error)) {
|
|
185
190
|
error = new InternalError(undefined, error);
|
|
@@ -194,8 +199,8 @@ const _handleError = (error) => {
|
|
|
194
199
|
message: error.message,
|
|
195
200
|
data: {
|
|
196
201
|
message: error.message,
|
|
197
|
-
txHash
|
|
198
|
-
data:
|
|
202
|
+
txHash,
|
|
203
|
+
data: returnData,
|
|
199
204
|
},
|
|
200
205
|
},
|
|
201
206
|
};
|