hardhat 3.4.4 → 3.5.0

package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js

@@ -0,0 +1,244 @@
+import { HardhatError } from "@nomicfoundation/hardhat-errors";
+/**
+ * Produces the flat list of canonical EIP-712 type strings expected by EDR.
+ *
+ * Each encodable struct contributes one entry, built like this:
+ *   1. Start with the struct's own head: `Name(type1 name1,type2 name2,...)`.
+ *   2. If the struct has fields that reference other structs, append those
+ *      structs' heads after it, sorted alphabetically.
+ *
+ * Examples:
+ *   - `Person` has only primitive fields (address, string), so its entry is
+ *     just its own head:
+ *       `Person(address wallet,string name)`
+ *   - `Mail` has a `Person` field, so its entry is its head plus `Person`'s
+ *     head appended:
+ *       `Mail(Person from,Person to,string contents)Person(address wallet,string name)`
+ *
+ * Structs that contain members whose type cannot be EIP-712 encoded (mappings,
+ * function types, etc.) are dropped entirely, along with any structs that
+ * depend on them transitively. This matches `forge bind-json`'s behavior:
+ * `resolve_struct_eip712` returns `None` for any struct containing unsupported
+ * constructs and propagates `None` through the dep graph so dependents are
+ * also dropped.
+ *
+ * Only names in `selectedNames` are emitted; non-selected structs still
+ * participate in dep resolution so cross-file deps inline correctly.
+ */
+export function canonicalizeStructs(structs, selectedNames) {
+    const byName = indexByName(structs, selectedNames);
+    const knownNames = new Set(byName.keys());
+    const encodable = computeEncodable(byName, knownNames);
+    const result = [];
+    for (const struct of byName.values()) {
+        if (!selectedNames.has(struct.name)) {
+            continue;
+        }
+        if (!encodable.has(struct.name)) {
+            continue;
+        }
+        const head = encodeStructHead(struct);
+        const deps = transitiveDeps(struct, byName)
+            .map((depName) => {
+            const def = byName.get(depName);
+            return def === undefined ? undefined : encodeStructHead(def);
+        })
+            .filter((s) => s !== undefined);
+        deps.sort();
+        result.push(head + deps.join(""));
+    }
+    return result;
+}
+/**
+ * Returns the set of struct names that are EIP-712 encodable. A struct is
+ * encodable if none of its members has a non-decodable type (`type === undefined`,
+ * e.g. mappings or function types) AND every one of its struct deps — direct or
+ * transitive — is itself encodable.
+ */
+function computeEncodable(byName, knownNames) {
+    const encodable = new Set(byName.keys());
+    for (const [name, struct] of byName) {
+        if (struct.members.some((m) => m.type === undefined)) {
+            encodable.delete(name);
+        }
+    }
+    const depsByName = new Map();
+    for (const [name, struct] of byName) {
+        depsByName.set(name, directStructDeps(struct, knownNames));
+    }
+    let changed = true;
+    while (changed) {
+        changed = false;
+        for (const name of [...encodable]) {
+            const deps = depsByName.get(name) ?? [];
+            if (deps.some((dep) => !encodable.has(dep))) {
+                encodable.delete(name);
+                changed = true;
+            }
+        }
+    }
+    return encodable;
+}
+/**
+ * Computes the EIP-712 `encodeType` string for one struct in isolation:
+ *   `Name(type1 name1,type2 name2,...)`.
+ * Members whose type is `undefined` (e.g. mappings) are dropped.
+ */
+function encodeStructHead(struct) {
+    const memberSegments = [];
+    for (const member of struct.members) {
+        if (member.type === undefined) {
+            continue;
+        }
+        memberSegments.push(`${member.type} ${member.name}`);
+    }
+    return `${struct.name}(${memberSegments.join(",")})`;
+}
+/**
+ * Returns the names of all struct dependencies referenced by `struct`'s
+ * members. Considers the base type of arrays. Members whose base type does not
+ * resolve to a known struct (elementary types, address, etc.) are ignored.
+ */
+function directStructDeps(struct, knownStructNames) {
+    const deps = new Set();
+    for (const member of struct.members) {
+        if (member.type === undefined) {
+            continue;
+        }
+        // Strip array suffixes: `Foo[]`, `Foo[3]`, `Foo[3][2]` → `Foo`.
+        const base = member.type.split("[")[0];
+        if (knownStructNames.has(base) && base !== struct.name) {
+            deps.add(base);
+        }
+    }
+    return [...deps];
+}
+/**
+ * Walks the dep graph from `root` and returns the set of all transitively
+ * referenced struct names (excluding the root itself).
+ */
+function transitiveDeps(root, byName) {
+    const visited = new Set();
+    const knownNames = new Set(byName.keys());
+    const stack = directStructDeps(root, knownNames);
+    while (stack.length > 0) {
+        const next = stack.pop();
+        if (next === undefined || visited.has(next) || next === root.name) {
+            continue;
+        }
+        visited.add(next);
+        const def = byName.get(next);
+        if (def !== undefined) {
+            stack.push(...directStructDeps(def, knownNames));
+        }
+    }
+    return [...visited];
+}
+/**
+ * Builds a name → definition map from collected structs, throwing
+ * `EIP712_DUPLICATE_STRUCT_NAME` when two structs share a name but have
+ * different member lists. Definitions with identical members are silently
+ * deduplicated (same struct seen across multiple build infos / partial
+ * recompiles).
+ *
+ * The comparison uses the full member list — including members whose type
+ * isn't EIP-712 encodable (mappings, function types) — so that two structs
+ * differing only in unsupported members are detected as conflicting rather
+ * than collapsed into one. Comparing only the encoded head would let a
+ * non decodable definition silently win over an encodable one, dropping the
+ * struct from the canonical output.
+ *
+ * Conflicts on a name reachable from any selected struct (selected roots plus
+ * their transitive deps) throw, since the selected struct's inlined dep head
+ * would otherwise depend on which conflicting copy happened to be seen first.
+ * Conflicts on names truly unreachable from the selected set are silently
+ * deduped (first wins). Selected structs are processed first so they win over
+ * non-selected copies.
+ */
+function indexByName(structs, selectedNames) {
+    const byName = new Map();
+    const fingerprintByName = new Map();
+    const sourceByName = new Map();
+    const deferredConflicts = new Map();
+    const ordered = [
+        ...structs.filter((s) => selectedNames.has(s.name)),
+        ...structs.filter((s) => !selectedNames.has(s.name)),
+    ];
+    for (const struct of ordered) {
+        const fingerprint = fingerprintStruct(struct);
+        const existingFingerprint = fingerprintByName.get(struct.name);
+        if (existingFingerprint === undefined) {
+            byName.set(struct.name, struct);
+            fingerprintByName.set(struct.name, fingerprint);
+            sourceByName.set(struct.name, struct.sourcePath);
+            continue;
+        }
+        if (existingFingerprint === fingerprint) {
+            continue;
+        }
+        if (!selectedNames.has(struct.name)) {
+            if (!deferredConflicts.has(struct.name)) {
+                deferredConflicts.set(struct.name, {
+                    firstSource: sourceByName.get(struct.name) ?? "<unknown>",
+                    secondSource: struct.sourcePath,
+                });
+            }
+            continue;
+        }
+        throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.EIP712_DUPLICATE_STRUCT_NAME, {
+            name: struct.name,
+            firstSource: sourceByName.get(struct.name) ?? "<unknown>",
+            secondSource: struct.sourcePath,
+        });
+    }
+    if (deferredConflicts.size > 0) {
+        const reachable = reachableFromSelected(byName, selectedNames);
+        for (const [name, sources] of deferredConflicts) {
+            if (reachable.has(name)) {
+                throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.EIP712_DUPLICATE_STRUCT_NAME, { name, ...sources });
+            }
+        }
+    }
+    return byName;
+}
+/**
+ * Set of struct names transitively referenced by any struct in `selectedNames`.
+ * The walk uses whatever first-wins definition is in `byName`; that's enough
+ * for conflict detection since we only need to know whether a name is
+ * reachable, not which conflicting copy is the "right" one.
+ */
+function reachableFromSelected(byName, selectedNames) {
+    const knownNames = new Set(byName.keys());
+    const reachable = new Set();
+    const stack = [];
+    for (const name of selectedNames) {
+        const root = byName.get(name);
+        if (root !== undefined) {
+            stack.push(...directStructDeps(root, knownNames));
+        }
+    }
+    while (stack.length > 0) {
+        const next = stack.pop();
+        if (next === undefined || reachable.has(next)) {
+            continue;
+        }
+        reachable.add(next);
+        const def = byName.get(next);
+        if (def !== undefined) {
+            stack.push(...directStructDeps(def, knownNames));
+        }
+    }
+    return reachable;
+}
+/**
+ * A stable string capturing every member of `struct`, used to detect
+ * conflicting definitions of the same name. Unlike `encodeStructHead`, this
+ * preserves members whose type can't be EIP-712 encoded — they're emitted with
+ * an `<unsupported>` sentinel — so structs that differ only in mapping or
+ * function-type members aren't collapsed together.
+ */
+function fingerprintStruct(struct) {
+    const segments = struct.members.map((m) => `${m.type ?? "<unsupported>"} ${m.name}`);
+    return `${struct.name}(${segments.join(",")})`;
+}
+//# sourceMappingURL=canonicalize.js.map

package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonicalize.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/canonicalize.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Returns true when `path` should be included given user-supplied include and
+ * exclude glob lists. `include` is the gate: an empty `include` matches
+ * nothing. `exclude` then narrows the included set.
+ */
+export declare function isPathSelected(path: string, include: string[], exclude: string[]): boolean;
+//# sourceMappingURL=glob.d.ts.map

package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glob.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/glob.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAcT"}

package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.js

@@ -0,0 +1,204 @@
+// The same patterns are reused for every source file, so compile each one once.
+const compiledGlobCache = new Map();
+/**
+ * Returns true when `path` should be included given user-supplied include and
+ * exclude glob lists. `include` is the gate: an empty `include` matches
+ * nothing. `exclude` then narrows the included set.
+ */
+export function isPathSelected(path, include, exclude) {
+    if (include.length === 0) {
+        return false;
+    }
+    if (!matchesAny(path, include)) {
+        return false;
+    }
+    if (exclude.length > 0 && matchesAny(path, exclude)) {
+        return false;
+    }
+    return true;
+}
+/**
+ * Returns true if `value` matches at least one of the given glob patterns.
+ */
+function matchesAny(value, patterns) {
+    for (const pattern of patterns) {
+        if (getCompiledGlob(pattern).test(value)) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Compiles a glob pattern into a regular expression. Supports `*`, `**`,
+ * `?`, `[abc]` (including `[a-z]` ranges and `[!abc]` / `[^abc]` negation),
+ * and `{a,b,c}` alternation.
+ */
+function globToRegExp(pattern) {
+    return new RegExp(`^${translateGlob(pattern)}$`);
+}
+function translateGlob(pattern) {
+    let regex = "";
+    let i = 0;
+    while (i < pattern.length) {
+        const c = pattern[i];
+        if (c === "*") {
+            if (pattern[i + 1] === "*") {
+                // `**` as a full path segment matches zero or more directories,
+                // e.g. `**/x.sol` matches both `x.sol` and `a/b/x.sol`.
+                const afterSlash = i === 0 || pattern[i - 1] === "/";
+                const beforeSlash = pattern[i + 2] === "/";
+                if (afterSlash && beforeSlash) {
+                    regex += "(?:.*/)?";
+                    i += 3;
+                }
+                else {
+                    regex += ".*";
+                    i += 2;
+                }
+            }
+            else {
+                regex += "[^/]*";
+                i += 1;
+            }
+        }
+        else if (c === "?") {
+            regex += "[^/]";
+            i += 1;
+        }
+        else if (c === "[") {
+            const end = findCharClassEnd(pattern, i);
+            if (end !== -1) {
+                regex += translateCharClass(pattern.slice(i + 1, end));
+                i = end + 1;
+                continue;
+            }
+            regex += "\\[";
+            i += 1;
+        }
+        else if (c === "{") {
+            const end = findBraceEnd(pattern, i);
+            if (end !== -1) {
+                const alternatives = splitBraceAlternatives(pattern.slice(i + 1, end)).map(translateGlob);
+                regex += `(?:${alternatives.join("|")})`;
+                i = end + 1;
+                continue;
+            }
+            regex += "\\{";
+            i += 1;
+        }
+        else if (/[.+^$()|\\\]}]/.test(c)) {
+            regex += `\\${c}`;
+            i += 1;
+        }
+        else {
+            regex += c;
+            i += 1;
+        }
+    }
+    return regex;
+}
+/**
+ * Returns the index of the `]` that closes the character class opened at
+ * `start`, or -1 if none is found. E.g. for `a[bc]d` starting at 1, returns 4.
+ */
+function findCharClassEnd(pattern, start) {
+    for (let i = start + 1; i < pattern.length; i++) {
+        if (pattern[i] === "]") {
+            return i;
+        }
+    }
+    return -1;
+}
+/**
+ * Returns the index of the `}` that closes the brace group opened at `start`,
+ * handling nested groups and skipping character classes, or -1 if unterminated.
+ * E.g. `{a,{b,c}}` returns the outer `}`; `{a[}]b}` skips the bracketed `}`.
+ */
+function findBraceEnd(pattern, start) {
+    let depth = 1;
+    let i = start + 1;
+    while (i < pattern.length) {
+        const c = pattern[i];
+        if (c === "{") {
+            depth += 1;
+        }
+        else if (c === "}") {
+            depth -= 1;
+            if (depth === 0) {
+                return i;
+            }
+        }
+        else if (c === "[") {
+            const end = findCharClassEnd(pattern, i);
+            if (end !== -1) {
+                i = end;
+            }
+        }
+        i += 1;
+    }
+    return -1;
+}
+/**
+ * Splits a brace group's body on top-level commas, leaving commas inside
+ * nested braces or character classes untouched. E.g. `a,{b,c},[d,e]` →
+ * `["a", "{b,c}", "[d,e]"]`.
+ */
+function splitBraceAlternatives(inside) {
+    const result = [];
+    let depth = 0;
+    let start = 0;
+    let i = 0;
+    while (i < inside.length) {
+        const c = inside[i];
+        if (c === "{") {
+            depth += 1;
+        }
+        else if (c === "}") {
+            depth -= 1;
+        }
+        else if (c === "[") {
+            const end = findCharClassEnd(inside, i);
+            if (end !== -1) {
+                i = end;
+            }
+        }
+        else if (c === "," && depth === 0) {
+            result.push(inside.slice(start, i));
+            start = i + 1;
+        }
+        i += 1;
+    }
+    result.push(inside.slice(start));
+    return result;
+}
+/**
+ * Translates a glob character class body into a regex character class.
+ * E.g. `Mm` → `[Mm]`, `!ab` → `[^ab]`, `a-z` → `[a-z]`.
+ */
+function translateCharClass(content) {
+    let negated = false;
+    let body = content;
+    if (body.startsWith("!") || body.startsWith("^")) {
+        negated = true;
+        body = body.slice(1);
+    }
+    let escaped = "";
+    for (const ch of body) {
+        if (ch === "\\" || ch === "]") {
+            escaped += `\\${ch}`;
+        }
+        else {
+            escaped += ch;
+        }
+    }
+    return `(?!/)[${negated ? "^" : ""}${escaped}]`;
+}
+function getCompiledGlob(pattern) {
+    let compiled = compiledGlobCache.get(pattern);
+    if (compiled === undefined) {
+        compiled = globToRegExp(pattern);
+        compiledGlobCache.set(pattern, compiled);
+    }
+    return compiled;
+}
+//# sourceMappingURL=glob.js.map

package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/glob.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts

@@ -0,0 +1,21 @@
+import type { BuildInfoAndOutput } from "../edr-artifacts.js";
+export interface Eip712TypesConfig {
+    include: string[];
+    exclude: string[];
+}
+/**
+ * Walks every compiled source's AST, extracts every struct definition, and
+ * returns the flat list of canonical EIP-712 type strings expected by EDR's
+ * `eip712CanonicalTypes` config field. Only structs from sources matching
+ * `include`/`exclude` are emitted; non-selected sources still feed the dep
+ * graph so cross-file deps inline correctly.
+ *
+ * `inputToUserSource` maps solc input source names to user source names; it's
+ * built by the caller from the artifact set so we don't pay to parse every
+ * build info just to recover that mapping.
+ *
+ * When `include` is empty/unset the feature is off: collection short-circuits
+ * and returns an empty list without parsing any build info.
+ */
+export declare function collectEip712CanonicalTypes(buildInfosAndOutputs: BuildInfoAndOutput[], inputToUserSource: ReadonlyMap<string, string>, config: Eip712TypesConfig): string[];
+//# sourceMappingURL=index.d.ts.map

package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAgB9D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAOD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CACzC,oBAAoB,EAAE,kBAAkB,EAAE,EAC1C,iBAAiB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9C,MAAM,EAAE,iBAAiB,GACxB,MAAM,EAAE,CAyEV"}

package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js

@@ -0,0 +1,77 @@
+import { bytesIncludesUtf8String, bytesToUtf8String, } from "@nomicfoundation/hardhat-utils/bytes";
+import { HARDHAT_PROJECT_INPUT_SOURCE_NAME_ROOT } from "../../solidity/constants.js";
+import { buildUserDefinedValueTypeIndex, extractStructsFromAst, } from "./ast-walker.js";
+import { canonicalizeStructs } from "./canonicalize.js";
+import { isPathSelected } from "./glob.js";
+// When a transitive project file doesn't produce an artifact — and so is
+// missing from `inputToUserSource` — stripping this prefix recovers the
+// user-facing path that the user's include/exclude globs are written against.
+const PROJECT_INPUT_SOURCE_NAME_PREFIX = `${HARDHAT_PROJECT_INPUT_SOURCE_NAME_ROOT}/`;
+/**
+ * Walks every compiled source's AST, extracts every struct definition, and
+ * returns the flat list of canonical EIP-712 type strings expected by EDR's
+ * `eip712CanonicalTypes` config field. Only structs from sources matching
+ * `include`/`exclude` are emitted; non-selected sources still feed the dep
+ * graph so cross-file deps inline correctly.
+ *
+ * `inputToUserSource` maps solc input source names to user source names; it's
+ * built by the caller from the artifact set so we don't pay to parse every
+ * build info just to recover that mapping.
+ *
+ * When `include` is empty/unset the feature is off: collection short-circuits
+ * and returns an empty list without parsing any build info.
+ */
+export function collectEip712CanonicalTypes(buildInfosAndOutputs, inputToUserSource, config) {
+    const { include, exclude } = config;
+    if (include.length === 0) {
+        return [];
+    }
+    const collected = [];
+    const selectedNames = new Set();
+    for (const { buildInfo, output } of buildInfosAndOutputs) {
+        // Byte-level fast path: a build info whose source bytes don't contain
+        // `struct ` can't define any EIP-712 type, so skip JSON-parsing its output.
+        if (!bytesIncludesUtf8String(buildInfo, "struct ")) {
+            continue;
+        }
+        const parsedOutput = JSON.parse(bytesToUtf8String(output));
+        const sources = parsedOutput.output.sources;
+        if (sources === undefined) {
+            continue;
+        }
+        // Two constraints determine the index's scope:
+        //
+        // 1. Per build info, not pooled across them. solc assigns node ids
+        //    fresh in each compilation, so the same numeric id can mean
+        //    different user-defined value types in different builds. Pooling
+        //    would let one compilation's definition silently overwrite
+        //    another's at the same key, mis-resolving `referencedDeclaration`.
+        //    See the test "scopes user-defined value type resolution per build
+        //    info when node ids collide" for a repro.
+        //
+        // 2. Whole build info, not narrowed to a subset of sources. A struct
+        //    member's `referencedDeclaration` can point at a user-defined
+        //    value type defined in any source within the same compilation, so
+        //    the index must cover every source in the build.
+        const userDefinedValueTypeI = buildUserDefinedValueTypeIndex(Object.values(sources).map((s) => s.ast));
+        for (const [inputSourceName, source] of Object.entries(sources)) {
+            let userSourceName = inputToUserSource.get(inputSourceName);
+            if (userSourceName === undefined) {
+                userSourceName = inputSourceName.startsWith(PROJECT_INPUT_SOURCE_NAME_PREFIX)
+                    ? inputSourceName.slice(PROJECT_INPUT_SOURCE_NAME_PREFIX.length)
+                    : inputSourceName;
+            }
+            // Collect every source so non-selected files can serve as dep targets;
+            // selection is enforced at emit time via `selectedNames`.
+            const structs = extractStructsFromAst(source.ast, userSourceName, userDefinedValueTypeI);
+            collected.push(...structs);
+            if (isPathSelected(userSourceName, include, exclude)) {
+                for (const s of structs) {
+                    selectedNames.add(s.name);
+                }
+            }
+        }
+    }
+    return canonicalizeStructs(collected, selectedNames);
+}
+//# sourceMappingURL=index.js.map

package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/index.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts

@@ -1,18 +1,19 @@
 import type { ChainType } from "../../../types/network.js";
-import type { SolidityTestConfig } from "../../../types/test.js";
+import type { SolidityTestProfileConfig } from "../../../types/test.js";
 import type { SolidityTestRunnerConfigArgs, Artifact, ObservabilityConfig, TestFunctionOverride } from "@nomicfoundation/edr";
 interface SolidityTestConfigParams {
     chainType: ChainType;
     projectRoot: string;
     hardfork?: string;
-    config: SolidityTestConfig;
+    config: Omit<SolidityTestProfileConfig, "eip712Types">;
     verbosity: number;
     observability?: ObservabilityConfig;
     testPattern?: string;
     generateGasReport: boolean;
     testFunctionOverrides?: TestFunctionOverride[];
+    eip712CanonicalTypes?: string[];
 }
-export declare function solidityTestConfigToSolidityTestRunnerConfigArgs({ chainType, projectRoot, hardfork, config, verbosity, observability, testPattern, generateGasReport, testFunctionOverrides, }: SolidityTestConfigParams): Promise<SolidityTestRunnerConfigArgs>;
+export declare function solidityTestConfigToSolidityTestRunnerConfigArgs({ chainType, projectRoot, hardfork, config, verbosity, observability, testPattern, generateGasReport, testFunctionOverrides, eip712CanonicalTypes, }: SolidityTestConfigParams): Promise<SolidityTestRunnerConfigArgs>;
 export declare function isTestSuiteArtifact(artifact: Artifact): boolean;
 export declare function warnDeprecatedTestFail(artifact: Artifact, sourceNameToUserSourceName: Map<string, string>): void;
 export {};

package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AACA,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,EACnB,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAqB9B,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;IAC3B,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAChD;AAED,wBAAsB,gDAAgD,CAAC,EACrE,SAAS,EACT,WAAW,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,qBAAqB,GACtB,EAAE,wBAAwB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAgGlE;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,GAC9C,IAAI,CAkBN"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EACV,4BAA4B,EAE5B,QAAQ,EACR,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAsB9B,UAAU,wBAAwB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,IAAI,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,wBAAsB,gDAAgD,CAAC,EACrE,SAAS,EACT,WAAW,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,GACrB,EAAE,wBAAwB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CA6GlE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAgB/D;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,IAAI,CAkBN"}