hardhat 3.1.11 → 3.1.12
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 +8 -0
- 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 +0 -1
- 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 +2 -14
- 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 +5 -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 +14 -0
- package/dist/src/internal/builtin-plugins/gas-analytics/helpers.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 +35 -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/index.js +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 +10 -5
- 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 +34 -12
- package/dist/src/internal/builtin-plugins/test/task-action.js.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 +4 -4
- package/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.ts +473 -0
- package/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.ts +3 -17
- package/src/internal/builtin-plugins/gas-analytics/helpers.ts +29 -0
- package/src/internal/builtin-plugins/gas-analytics/index.ts +36 -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/index.ts +1 -1
- 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 +17 -8
- package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +17 -10
- package/src/internal/builtin-plugins/test/task-action.ts +36 -18
- package/src/types/test.ts +8 -0
- package/templates/hardhat-3/01-node-test-runner-viem/package.json +2 -2
- package/templates/hardhat-3/02-mocha-ethers/package.json +2 -2
- 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":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAC3B,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,gBAAgB,GAElB,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;IAChC,MAAM,WAAW,GACf,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;IACxC,MAAM,qBAAqB,GAAG,WAAW;QACvC,CAAC,CAAC,WAAW,CAAC,KAAK;QACnB,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC;IACtB,MAAM,YAAY,GAAG,qBAAqB,CAAC,YAAY,CAAC;IACxD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IAEvC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,iCAAiC,CAC1E,CAAC;IACJ,CAAC;IAED,IAAI,mBAAmB,GAAG,IAAI,CAAC;IAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,QAAQ,EACR,YAAY,EACZ,WAAW,CACZ,CAAC;QACF,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QAC7C,MAAM,mBAAmB,GAAG,MAAM,mBAAmB,CACnD,QAAQ,EACR,YAAY,CACb,CAAC;QACF,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAC5C,mBAAmB;YACjB,mBAAmB,CAAC,yBAAyB,CAAC,MAAM;gBACpD,mBAAmB,CAAC,uBAAuB,CAAC,MAAM,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,OAAO,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,YAA2B,EAC3B,WAAoB;IAEpB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;QACvE,MAAM,yBAAyB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAE5D,OAAO;QACL,2BAA2B,EAAE,WAAW;KACzC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,MAAsB,EACtB,SAA6B,OAAO,CAAC,GAAG;IAExC,IAAI,MAAM,CAAC,2BAA2B,EAAE,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC,CAAC;QACnE,MAAM,EAAE,CAAC;IACX,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,QAAgB,EAChB,YAA2B;IAE3B,MAAM,yBAAyB,GAAG,MAAM,yBAAyB,CAC/D,QAAQ,EACR,YAAY,CACb,CAAC;IACF,MAAM,uBAAuB,GAAG,MAAM,uBAAuB,CAC3D,QAAQ,EACR,YAAY,CACb,CAAC;IAEF,OAAO;QACL,yBAAyB;QACzB,uBAAuB;KACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,EAAE,yBAAyB,EAAE,uBAAuB,EAAuB,EAC3E,SAA6B,OAAO,CAAC,GAAG;IAExC,MAAM,CACJ,yBAAyB,CAAC,MAAM,IAAI,uBAAuB,CAAC,MAAM;QAChE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC;QACtC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CACvC,CAAC;IAEF,MAAM,oBAAoB,GACxB,yBAAyB,CAAC,OAAO;QACjC,yBAAyB,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QACvD,yBAAyB,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QACrD,yBAAyB,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1D,MAAM,2BAA2B,GAC/B,uBAAuB,CAAC,OAAO;QAC/B,uBAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QACrD,uBAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QACnD,uBAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAExD,6DAA6D;IAC7D,IAAI,oBAAoB,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC;IACX,CAAC;IAED,8BAA8B,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;IAElE,+DAA+D;IAC/D,6DAA6D;IAC7D,IAAI,CAAC,oBAAoB,IAAI,2BAA2B,EAAE,CAAC;QACzD,MAAM,EAAE,CAAC;IACX,CAAC;IAED,4BAA4B,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IAE9D,IAAI,CAAC,yBAAyB,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC;QACzE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC;QAC5E,MAAM,EAAE,CAAC;IACX,CAAC;AACH,CAAC;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { HardhatUserConfig } from "../../../config.js";
|
|
2
2
|
import type { ConfigurationVariableResolver, HardhatConfig } from "../../../types/config.js";
|
|
3
3
|
import type { HardhatUserConfigValidationError } from "../../../types/hooks.js";
|
|
4
|
-
import type { SolidityTestForkingConfig, SolidityTestUserConfig } from "../../../types/test.js";
|
|
4
|
+
import type { SolidityTestConfig, SolidityTestForkingConfig, SolidityTestUserConfig } from "../../../types/test.js";
|
|
5
|
+
export declare const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
|
|
5
6
|
export declare function resolveSolidityTestForkingConfig(forkingUserConfig: SolidityTestUserConfig["forking"], resolveConfigurationVariable: ConfigurationVariableResolver): SolidityTestForkingConfig | undefined;
|
|
6
7
|
export declare function validateSolidityTestUserConfig(userConfig: unknown): HardhatUserConfigValidationError[];
|
|
7
8
|
export declare function resolveSolidityTestUserConfig(userConfig: HardhatUserConfig, resolvedConfig: HardhatConfig, resolveConfigurationVariable: ConfigurationVariableResolver): Promise<HardhatConfig>;
|
|
9
|
+
export declare function resolveFuzzConfig(fuzzUserConfig?: SolidityTestUserConfig["fuzz"]): SolidityTestConfig["fuzz"];
|
|
8
10
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EACV,6BAA6B,EAC7B,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACV,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EACV,6BAA6B,EAC7B,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAehC,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AA+EvE,wBAAgB,gCAAgC,CAC9C,iBAAiB,EAAE,sBAAsB,CAAC,SAAS,CAAC,EACpD,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,GAAG,SAAS,CAqBvC;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,OAAO,GAClB,gCAAgC,EAAE,CAEpC;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,aAAa,EAC7B,4BAA4B,EAAE,6BAA6B,GAC1D,OAAO,CAAC,aAAa,CAAC,CAmCxB;AAED,wBAAgB,iBAAiB,CAC/B,cAAc,GAAE,sBAAsB,CAAC,MAAM,CAAM,GAClD,kBAAkB,CAAC,MAAM,CAAC,CAK5B"}
|
|
@@ -3,6 +3,8 @@ import { isObject } from "@nomicfoundation/hardhat-utils/lang";
|
|
|
3
3
|
import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
|
|
4
4
|
import { conditionalUnionType, sensitiveStringSchema, sensitiveUrlSchema, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
|
|
5
5
|
import { z } from "zod";
|
|
6
|
+
// the keccak256 of "built for ethereum"
|
|
7
|
+
export const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
|
|
6
8
|
const solidityTestUserConfigType = z.object({
|
|
7
9
|
timeout: z.number().optional(),
|
|
8
10
|
fsPermissions: z
|
|
@@ -106,6 +108,7 @@ export async function resolveSolidityTestUserConfig(userConfig, resolvedConfig,
|
|
|
106
108
|
const solidityTest = {
|
|
107
109
|
rpcCachePath: defaultRpcCachePath,
|
|
108
110
|
...userConfig.test?.solidity,
|
|
111
|
+
fuzz: resolveFuzzConfig(userConfig.test?.solidity?.fuzz),
|
|
109
112
|
forking: resolvedForking,
|
|
110
113
|
};
|
|
111
114
|
return {
|
|
@@ -123,4 +126,10 @@ export async function resolveSolidityTestUserConfig(userConfig, resolvedConfig,
|
|
|
123
126
|
},
|
|
124
127
|
};
|
|
125
128
|
}
|
|
129
|
+
export function resolveFuzzConfig(fuzzUserConfig = {}) {
|
|
130
|
+
return {
|
|
131
|
+
...fuzzUserConfig,
|
|
132
|
+
seed: fuzzUserConfig.seed ?? DEFAULT_FUZZ_SEED,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
126
135
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EACV,4BAA4B,EAE5B,QAAQ,EACR,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAkB9B,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAEnE,UAAU,wBAAwB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EACV,4BAA4B,EAE5B,QAAQ,EACR,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAkB9B,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAEnE,UAAU,wBAAwB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,kBAAkB,GACzB,UAAU,CAEZ;AAED,wBAAsB,gDAAgD,CAAC,EACrE,SAAS,EACT,WAAW,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,aAAa,EACb,WAAW,EACX,iBAAiB,GAClB,EAAE,wBAAwB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAoGlE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAQ/D;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,SAAS,GAAE,SAAiB,GAC3B,IAAI,CAkBN"}
|
|
@@ -5,9 +5,6 @@ import { DEFAULT_VERBOSITY, OPTIMISM_CHAIN_TYPE } from "../../constants.js";
|
|
|
5
5
|
import { resolveHardfork } from "../network-manager/config-resolution.js";
|
|
6
6
|
import { hardhatHardforkToEdrSpecId } from "../network-manager/edr/utils/convert-to-edr.js";
|
|
7
7
|
import { formatArtifactId } from "./formatters.js";
|
|
8
|
-
function hexStringToBuffer(hexString) {
|
|
9
|
-
return Buffer.from(hexStringToBytes(hexString));
|
|
10
|
-
}
|
|
11
8
|
export function solidityTestConfigToRunOptions(config) {
|
|
12
9
|
return config;
|
|
13
10
|
}
|
|
@@ -38,13 +35,10 @@ export async function solidityTestConfigToSolidityTestRunnerConfigArgs({ chainTy
|
|
|
38
35
|
path: p,
|
|
39
36
|
})) ?? [],
|
|
40
37
|
].flat(1);
|
|
41
|
-
const
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const blockCoinbase = config.coinbase === undefined
|
|
46
|
-
? undefined
|
|
47
|
-
: hexStringToBuffer(config.coinbase);
|
|
38
|
+
const hexToBytes = (hex) => hex !== undefined ? hexStringToBytes(hex) : undefined;
|
|
39
|
+
const sender = hexToBytes(config.from);
|
|
40
|
+
const txOrigin = hexToBytes(config.txOrigin);
|
|
41
|
+
const blockCoinbase = hexToBytes(config.coinbase);
|
|
48
42
|
const resolvedHardfork = hardhatHardforkToEdrSpecId(resolveHardfork(hardfork, chainType), chainType);
|
|
49
43
|
const localPredeploys = chainType === OPTIMISM_CHAIN_TYPE
|
|
50
44
|
? opGenesisState(opHardforkFromString(resolvedHardfork))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,cAAc,EACd,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAE5F,OAAO,EAAkB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAanE,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,aAmDpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,wBAAwB;IAC5B,YAAY,EAAE;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC;QACjD,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC9C;IACD,KAAK,EAAE;QACL,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,wBAAwB,CAAC;aACjD,mBAAmB,CAAC;YACnB,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,mCAAmC;YAChD,YAAY,EAAE,EAAE;SACjB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,uBAAuB;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,YAAY,CAAC,sBAAsB;YACzC,YAAY,EAAE,SAAS;SACxB,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,oDAAoD;SAClE,CAAC;aACD,QAAQ,CAAC;YACR,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,oCAAoC;YACjD,YAAY,EAAE,iBAAiB;SAChC,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,mEAAmE;YACrE,IAAI,EAAE,YAAY,CAAC,GAAG;YACtB,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,IAAI;SACb,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACjD,KAAK,EAAE;KACX;IACD,YAAY,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,sBAAsB,CAAC;QAC9B,MAAM,CAAC,kBAAkB,CAAC;QAC1B,MAAM,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,wBAAwB;IAC5B,YAAY,EAAE;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC;QACjD,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC9C;IACD,KAAK,EAAE;QACL,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,wBAAwB,CAAC;aACjD,mBAAmB,CAAC;YACnB,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,mCAAmC;YAChD,YAAY,EAAE,EAAE;SACjB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,uBAAuB;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,YAAY,CAAC,sBAAsB;YACzC,YAAY,EAAE,SAAS;SACxB,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,oDAAoD;SAClE,CAAC;aACD,QAAQ,CAAC;YACR,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,oCAAoC;YACjD,YAAY,EAAE,iBAAiB;SAChC,CAAC;aACD,SAAS,CAAC;YACT,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,mEAAmE;YACrE,IAAI,EAAE,YAAY,CAAC,GAAG;YACtB,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,IAAI;SACb,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACjD,KAAK,EAAE;KACX;IACD,YAAY,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,sBAAsB,CAAC;QAC9B,MAAM,CAAC,kBAAkB,CAAC;QAC1B,MAAM,CAAC,sBAAsB,CAAC;KAC/B;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -23,5 +23,5 @@ export interface RunOptions {
|
|
|
23
23
|
*
|
|
24
24
|
* TODO: Once the signature is finalized, give feedback to the EDR team.
|
|
25
25
|
*/
|
|
26
|
-
export declare function run(chainType: ChainType, artifacts: Artifact[], testSuiteIds: ArtifactId[],
|
|
26
|
+
export declare function run(chainType: ChainType, artifacts: Artifact[], testSuiteIds: ArtifactId[], testRunnerConfig: SolidityTestRunnerConfigArgs, tracingConfig: TracingConfigWithBuffers, sourceNameToUserSourceName: Map<string, string>, options?: RunOptions): TestsStream;
|
|
27
27
|
//# sourceMappingURL=runner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,WAAW,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,4BAA4B,EAC5B,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAY9B,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,GAAG,CACjB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,QAAQ,EAAE,EACrB,YAAY,EAAE,UAAU,EAAE,EAC1B,
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,WAAW,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,4BAA4B,EAC5B,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAY9B,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,GAAG,CACjB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,QAAQ,EAAE,EACrB,YAAY,EAAE,UAAU,EAAE,EAC1B,gBAAgB,EAAE,4BAA4B,EAC9C,aAAa,EAAE,wBAAwB,EACvC,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,OAAO,CAAC,EAAE,UAAU,GACnB,WAAW,CAmFb"}
|
|
@@ -20,7 +20,7 @@ import { formatArtifactId } from "./formatters.js";
|
|
|
20
20
|
*
|
|
21
21
|
* TODO: Once the signature is finalized, give feedback to the EDR team.
|
|
22
22
|
*/
|
|
23
|
-
export function run(chainType, artifacts, testSuiteIds,
|
|
23
|
+
export function run(chainType, artifacts, testSuiteIds, testRunnerConfig, tracingConfig, sourceNameToUserSourceName, options) {
|
|
24
24
|
const stream = new ReadableStream({
|
|
25
25
|
async start(controller) {
|
|
26
26
|
if (testSuiteIds.length === 0) {
|
|
@@ -41,7 +41,7 @@ export function run(chainType, artifacts, testSuiteIds, configArgs, tracingConfi
|
|
|
41
41
|
// TODO: Add support for predeploys once EDR supports them.
|
|
42
42
|
try {
|
|
43
43
|
const edrContext = await getGlobalEdrContext();
|
|
44
|
-
const solidityTestResult = await edrContext.runSolidityTests(hardhatChainTypeToEdrChainType(chainType), artifacts, testSuiteIds,
|
|
44
|
+
const solidityTestResult = await edrContext.runSolidityTests(hardhatChainTypeToEdrChainType(chainType), artifacts, testSuiteIds, testRunnerConfig, tracingConfig, (suiteResult) => {
|
|
45
45
|
controller.enqueue({
|
|
46
46
|
type: "suite:done",
|
|
47
47
|
data: suiteResult,
|