hardhat 3.4.4 → 3.5.0

package/dist/src/internal/builtin-plugins/solidity/type-extensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-extensions.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/type-extensions.ts"],"names":[],"mappings":"AAaA,OAAO,0BAA0B,CAAC;AAmTlC,OAAO,uBAAuB,CAAC;AAO/B,OAAO,kCAAkC,CAAC;AAO1C,OAAO,yBAAyB,CAAC"}
+{"version":3,"file":"type-extensions.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/type-extensions.ts"],"names":[],"mappings":""}

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

@@ -1,10 +1,11 @@
 import type { HardhatUserConfig } from "../../../config.js";
 import type { ConfigurationVariableResolver, HardhatConfig } from "../../../types/config.js";
 import type { HardhatUserConfigValidationError } from "../../../types/hooks.js";
-import type { SolidityTestConfig, SolidityTestForkingConfig, SolidityTestUserConfig } from "../../../types/test.js";
+import type { SolidityTestForkingConfig, SolidityTestProfileConfig, SolidityTestProfileUserConfig } from "../../../types/test.js";
 export declare const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
-export declare function resolveSolidityTestForkingConfig(forkingUserConfig: SolidityTestUserConfig["forking"], resolveConfigurationVariable: ConfigurationVariableResolver): SolidityTestForkingConfig | undefined;
+export declare function resolveSolidityTestForkingConfig(forkingUserConfig: SolidityTestProfileUserConfig["forking"], resolveConfigurationVariable: ConfigurationVariableResolver): SolidityTestForkingConfig | undefined;
 export declare function validateSolidityTestUserConfig(userConfig: unknown): HardhatUserConfigValidationError[];
 export declare function resolveSolidityTestUserConfig(userConfig: HardhatUserConfig, resolvedConfig: HardhatConfig, resolveConfigurationVariable: ConfigurationVariableResolver): Promise<HardhatConfig>;
-export declare function resolveFuzzConfig(fuzzUserConfig?: SolidityTestUserConfig["fuzz"]): SolidityTestConfig["fuzz"];
+export declare function resolveFuzzConfig(fuzzUserConfig?: SolidityTestProfileUserConfig["fuzz"]): SolidityTestProfileConfig["fuzz"];
+export declare function resolveEip712TypesConfig(eip712TypesUserConfig?: SolidityTestProfileUserConfig["eip712Types"]): SolidityTestProfileConfig["eip712Types"];
 //# sourceMappingURL=config.d.ts.map

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

@@ -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,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAgBhC,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AAoFvE,wBAAgB,gCAAgC,CAC9C,iBAAiB,EAAE,sBAAsB,CAAC,SAAS,CAAC,EACpD,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,GAAG,SAAS,CAyBvC;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"}
+{"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,yBAAyB,EACzB,6BAA6B,EAC9B,MAAM,wBAAwB,CAAC;AAoBhC,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AAiIvE,wBAAgB,gCAAgC,CAC9C,iBAAiB,EAAE,6BAA6B,CAAC,SAAS,CAAC,EAC3D,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,GAAG,SAAS,CAyBvC;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,CAkDxB;AAED,wBAAgB,iBAAiB,CAC/B,cAAc,GAAE,6BAA6B,CAAC,MAAM,CAAM,GACzD,yBAAyB,CAAC,MAAM,CAAC,CAKnC;AAED,wBAAgB,wBAAwB,CACtC,qBAAqB,GAAE,6BAA6B,CAAC,aAAa,CAAM,GACvE,yBAAyB,CAAC,aAAa,CAAC,CAK1C"}

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

@@ -1,11 +1,13 @@
 import path from "node:path";
+import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
 import { isObject } from "@nomicfoundation/hardhat-utils/lang";
 import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
-import { conditionalUnionType, sensitiveStringSchema, sensitiveUrlSchema, unionType, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
+import { conditionalUnionType, incompatibleFieldType, sensitiveStringSchema, sensitiveUrlSchema, unionType, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
 import { z } from "zod";
+import { DEFAULT_TEST_PROFILE } from "./test-profiles.js";
 // the keccak256 of "built for ethereum"
 export const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
-const solidityTestUserConfigType = z.object({
+const solidityTestProfileUserConfigType = z.object({
     fsPermissions: z
         .object({
         readWriteFile: z.array(z.string()).optional(),
@@ -27,7 +29,11 @@ const solidityTestUserConfigType = z.object({
     blockTimestamp: z.bigint().optional(),
     prevRandao: z.bigint().optional(),
     gasLimit: z.bigint().optional(),
-    blockGasLimit: z.bigint().or(z.literal(false)).optional(),
+    blockGasLimit: z.number().or(z.bigint()).or(z.literal(false)).optional(),
+    // TODO: widen back to .number().or(z.bigint()).or(z.literal(false))
+    // once Solidity test runner no longer breaks setUp() when
+    // disableTransactionGasCap is false. See PR #8301.
+    transactionGasCap: z.literal(false).optional(),
     fuzz: z
         .object({
         failurePersistDir: z.string().optional(),
@@ -61,7 +67,30 @@ const solidityTestUserConfigType = z.object({
         shrinkRunLimit: z.number().optional(),
     })
         .optional(),
+    eip712Types: z
+        .object({
+        include: z.array(z.string()).optional(),
+        exclude: z.array(z.string()).optional(),
+    })
+        .optional(),
 });
+const solidityTestFlatUserConfigType = solidityTestProfileUserConfigType.extend({
+    profiles: incompatibleFieldType("This field is incompatible with the flat solidity test config"),
+});
+const solidityTestProfilesUserConfigType = z.object({
+    profiles: z
+        .record(z.string(), solidityTestProfileUserConfigType)
+        .refine((profiles) => DEFAULT_TEST_PROFILE in profiles, "A `default` profile is required when using `profiles`")
+        .refine((profiles) => !(DEFAULT_TEST_PROFILE in profiles) ||
+        Object.keys(profiles).every((name) => name === DEFAULT_TEST_PROFILE), "Only the `default` profile is supported. Other profile names will be supported in a future release."),
+});
+const solidityTestUserConfigType = conditionalUnionType([
+    [
+        (data) => isObject(data) && "profiles" in data && Object.keys(data).length === 1,
+        solidityTestProfilesUserConfigType,
+    ],
+    [isObject, solidityTestFlatUserConfigType],
+], "Expected a Solidity test config or a `{ profiles: { ... } }` wrapper");
 const userConfigType = z.object({
     paths: z
         .object({
@@ -107,12 +136,22 @@ export async function resolveSolidityTestUserConfig(userConfig, resolvedConfig,
     testsPath = typeof testsPath === "object" ? testsPath.solidity : testsPath;
     testsPath ??= "test";
     const defaultRpcCachePath = path.join(resolvedConfig.paths.cache, "edr");
-    const resolvedForking = resolveSolidityTestForkingConfig(userConfig.test?.solidity?.forking, resolveConfigurationVariable);
-    const solidityTest = {
+    const solidityUserConfig = userConfig.test?.solidity;
+    let profileUserConfig;
+    if (solidityUserConfig !== undefined && "profiles" in solidityUserConfig) {
+        profileUserConfig = solidityUserConfig.profiles[DEFAULT_TEST_PROFILE];
+        assertHardhatInvariant(profileUserConfig !== undefined, "default profile must be present when the profiles wrapper user config is supplied");
+    }
+    else {
+        profileUserConfig = solidityUserConfig;
+    }
+    const resolvedForking = resolveSolidityTestForkingConfig(profileUserConfig?.forking, resolveConfigurationVariable);
+    const resolvedDefaultProfile = {
         rpcCachePath: defaultRpcCachePath,
-        ...userConfig.test?.solidity,
-        fuzz: resolveFuzzConfig(userConfig.test?.solidity?.fuzz),
+        ...profileUserConfig,
+        fuzz: resolveFuzzConfig(profileUserConfig?.fuzz),
         forking: resolvedForking,
+        eip712Types: resolveEip712TypesConfig(profileUserConfig?.eip712Types),
     };
     return {
         ...resolvedConfig,
@@ -125,7 +164,9 @@ export async function resolveSolidityTestUserConfig(userConfig, resolvedConfig,
         },
         test: {
             ...resolvedConfig.test,
-            solidity: solidityTest,
+            solidity: {
+                profiles: { [DEFAULT_TEST_PROFILE]: resolvedDefaultProfile },
+            },
         },
     };
 }
@@ -135,4 +176,10 @@ export function resolveFuzzConfig(fuzzUserConfig = {}) {
         seed: fuzzUserConfig.seed ?? DEFAULT_FUZZ_SEED,
     };
 }
+export function resolveEip712TypesConfig(eip712TypesUserConfig = {}) {
+    return {
+        include: eip712TypesUserConfig.include ?? [],
+        exclude: eip712TypesUserConfig.exclude ?? [],
+    };
+}
 //# sourceMappingURL=config.js.map

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

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

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

@@ -0,0 +1,58 @@
+/**
+ * A single field of a Solidity struct
+ */
+export interface StructMember {
+    name: string;
+    /**
+     * EIP-712 type string, or `undefined` if the type can't be encoded (e.g. mappings).
+     */
+    type: string | undefined;
+}
+/**
+ * A Solidity struct extracted from a source AST (Abstract Syntax Tree).
+ */
+export interface CollectedStruct {
+    name: string;
+    members: StructMember[];
+    /**
+     * Project-relative source path. Used for diagnostics only.
+     */
+    sourcePath: string;
+}
+/**
+ * A user-defined value type (`type Foo is bytes32;`) resolves to its
+ * underlying elementary type for EIP-712 encoding.
+ * The map is keyed by the user-defined value type definition's solc node id,
+ * which is what `referencedDeclaration` on a `UserDefinedTypeName` reference
+ * points to.
+ */
+export type UserDefinedValueTypeIndex = Map<number, Record<string, unknown>>;
+/**
+ * Walks every AST in the build and indexes every `UserDefinedValueTypeDefinition`
+ * by its node `id`, mapping to its `underlyingType` (an `ElementaryTypeName`).
+ *
+ * User-defined value types can sit at file scope or inside a contract, and a
+ * struct in one source may reference a user-defined value type defined in
+ * another, so this must run across every AST in the build — not just the ones
+ * matched by the user's include globs.
+ */
+export declare function buildUserDefinedValueTypeIndex(asts: unknown[]): UserDefinedValueTypeIndex;
+/**
+ * Returns every struct definition reachable from a solc source AST (Abstract Syntax Tree),
+ * including structs nested inside contracts.
+ */
+export declare function extractStructsFromAst(ast: unknown, sourcePath: string, userDefinedValueTypeI?: UserDefinedValueTypeIndex): CollectedStruct[];
+/**
+ * Converts a solc `typeName` AST node into its EIP-712 type string, following
+ * the same conventions as `forge bind-json`:
+ *
+ *   - elementary types pass through (`address`, `uint256`, `string`, ...)
+ *   - enums                  → `uint8`
+ *   - contracts / interfaces → `address`
+ *   - structs                → bare name (`Wallet.Person` → `Person`)
+ *   - user-defined value types → underlying elementary type (`type Foo is bytes32` → `bytes32`)
+ *   - arrays                 → `T[]` (dynamic) or `T[N]` (fixed)
+ *   - mappings / functions   → `undefined` (not EIP-712 encodable)
+ */
+export declare function encodeMemberType(typeName: unknown, userDefinedValueTypeI?: UserDefinedValueTypeIndex): string | undefined;
+//# sourceMappingURL=ast-walker.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ast-walker.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/ast-walker.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,OAAO,EAAE,GACd,yBAAyB,CA+B3B;AAeD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,qBAAqB,GAAE,yBAAqC,GAC3D,eAAe,EAAE,CAoCnB;AAyCD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,EACjB,qBAAqB,GAAE,yBAAqC,GAC3D,MAAM,GAAG,SAAS,CAoIpB"}

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

@@ -0,0 +1,226 @@
+import { isObject } from "@nomicfoundation/hardhat-utils/lang";
+/**
+ * Walks every AST in the build and indexes every `UserDefinedValueTypeDefinition`
+ * by its node `id`, mapping to its `underlyingType` (an `ElementaryTypeName`).
+ *
+ * User-defined value types can sit at file scope or inside a contract, and a
+ * struct in one source may reference a user-defined value type defined in
+ * another, so this must run across every AST in the build — not just the ones
+ * matched by the user's include globs.
+ */
+export function buildUserDefinedValueTypeIndex(asts) {
+    const index = new Map();
+    for (const ast of asts) {
+        if (!isObject(ast) || ast.nodeType !== "SourceUnit") {
+            continue;
+        }
+        const topLevelNodes = Array.isArray(ast.nodes) ? ast.nodes : [];
+        for (const node of topLevelNodes) {
+            if (!isObject(node)) {
+                continue;
+            }
+            if (node.nodeType === "UserDefinedValueTypeDefinition") {
+                recordUserDefinedValueType(node, index);
+            }
+            else if (node.nodeType === "ContractDefinition") {
+                const members = Array.isArray(node.nodes) ? node.nodes : [];
+                for (const member of members) {
+                    if (isObject(member) &&
+                        member.nodeType === "UserDefinedValueTypeDefinition") {
+                        recordUserDefinedValueType(member, index);
+                    }
+                }
+            }
+        }
+    }
+    return index;
+}
+function recordUserDefinedValueType(node, index) {
+    if (typeof node.id === "number" &&
+        isObject(node.underlyingType) &&
+        node.underlyingType.nodeType === "ElementaryTypeName") {
+        index.set(node.id, node.underlyingType);
+    }
+}
+/**
+ * Returns every struct definition reachable from a solc source AST (Abstract Syntax Tree),
+ * including structs nested inside contracts.
+ */
+export function extractStructsFromAst(ast, sourcePath, userDefinedValueTypeI = new Map()) {
+    if (!isObject(ast) || ast.nodeType !== "SourceUnit") {
+        return [];
+    }
+    const results = [];
+    const topLevelNodes = Array.isArray(ast.nodes) ? ast.nodes : [];
+    for (const node of topLevelNodes) {
+        if (!isObject(node)) {
+            continue;
+        }
+        if (node.nodeType === "StructDefinition") {
+            const collected = collectStruct(node, sourcePath, userDefinedValueTypeI);
+            if (collected !== undefined) {
+                results.push(collected);
+            }
+        }
+        else if (node.nodeType === "ContractDefinition") {
+            const members = Array.isArray(node.nodes) ? node.nodes : [];
+            for (const member of members) {
+                if (isObject(member) && member.nodeType === "StructDefinition") {
+                    const collected = collectStruct(member, sourcePath, userDefinedValueTypeI);
+                    if (collected !== undefined) {
+                        results.push(collected);
+                    }
+                }
+            }
+        }
+    }
+    return results;
+}
+function collectStruct(node, sourcePath, userDefinedValueTypeI) {
+    if (typeof node.name !== "string") {
+        return undefined;
+    }
+    const memberNodes = Array.isArray(node.members)
+        ? node.members
+        : [];
+    const members = [];
+    for (const memberNode of memberNodes) {
+        if (!isObject(memberNode) ||
+            memberNode.nodeType !== "VariableDeclaration") {
+            continue;
+        }
+        if (typeof memberNode.name !== "string") {
+            continue;
+        }
+        members.push({
+            name: memberNode.name,
+            type: encodeMemberType(memberNode.typeName, userDefinedValueTypeI),
+        });
+    }
+    return {
+        name: node.name,
+        members,
+        sourcePath,
+    };
+}
+/**
+ * Converts a solc `typeName` AST node into its EIP-712 type string, following
+ * the same conventions as `forge bind-json`:
+ *
+ *   - elementary types pass through (`address`, `uint256`, `string`, ...)
+ *   - enums                  → `uint8`
+ *   - contracts / interfaces → `address`
+ *   - structs                → bare name (`Wallet.Person` → `Person`)
+ *   - user-defined value types → underlying elementary type (`type Foo is bytes32` → `bytes32`)
+ *   - arrays                 → `T[]` (dynamic) or `T[N]` (fixed)
+ *   - mappings / functions   → `undefined` (not EIP-712 encodable)
+ */
+export function encodeMemberType(typeName, userDefinedValueTypeI = new Map()) {
+    if (!isObject(typeName)) {
+        return undefined;
+    }
+    switch (typeName.nodeType) {
+        case "ElementaryTypeName": {
+            // Prefer `typeDescriptions.typeString` over `name`: solc emits the
+            // unresolved alias in `name` (`uint`, `int`, `byte`), but the canonical
+            // EIP-712 type is in `typeString` (`uint256`, `int256`, `bytes1`).
+            // `address payable` is the exception — `typeString` is `"address payable"`
+            // while the canonical EIP-712 type is just `address`.
+            const desc = isObject(typeName.typeDescriptions)
+                ? typeName.typeDescriptions
+                : undefined;
+            const typeString = typeof desc?.typeString === "string" ? desc.typeString : undefined;
+            if (typeString !== undefined) {
+                return typeString.endsWith(" payable")
+                    ? typeString.slice(0, -" payable".length)
+                    : typeString;
+            }
+            return typeof typeName.name === "string" ? typeName.name : undefined;
+        }
+        case "UserDefinedTypeName": {
+            // `typeDescriptions.typeString` is the only reliable way to tell what
+            // kind of user-defined type this is — e.g. "struct Foo", "enum Bar",
+            // "contract Token". The AST node itself doesn't say. Note that solc
+            // emits the "contract " prefix for interface references as well.
+            const desc = isObject(typeName.typeDescriptions)
+                ? typeName.typeDescriptions
+                : undefined;
+            const typeString = typeof desc?.typeString === "string" ? desc.typeString : "";
+            if (typeString.startsWith("enum ")) {
+                return "uint8";
+            }
+            if (typeString.startsWith("contract ")) {
+                return "address";
+            }
+            if (typeString.startsWith("struct ")) {
+                // EIP-712 references structs by their bare name, so strip both the
+                // "struct " prefix, any storage-location suffix solc may append
+                // ("memory", "storage", ...), and any qualifier ("Wallet.Person").
+                const remainder = typeString.slice("struct ".length).trim();
+                const namePart = remainder.split(/\s+/)[0];
+                const segments = namePart.split(".");
+                return segments[segments.length - 1];
+            }
+            // User-defined value types (`type Foo is bytes32;`, solc 0.8.8+).
+            // Resolve via `referencedDeclaration` against the build-wide
+            // user-defined value type index
+            // and recurse on the underlying elementary type — matching forge's
+            // `Resolver::resolve_type` so `Foo h` encodes as `bytes32 h`, not `Foo h`.
+            const refId = typeof typeName.referencedDeclaration === "number"
+                ? typeName.referencedDeclaration
+                : isObject(typeName.pathNode) &&
+                    typeof typeName.pathNode.referencedDeclaration === "number"
+                    ? typeName.pathNode.referencedDeclaration
+                    : undefined;
+            if (refId !== undefined) {
+                const underlying = userDefinedValueTypeI.get(refId);
+                if (underlying !== undefined) {
+                    return encodeMemberType(underlying, userDefinedValueTypeI);
+                }
+            }
+            // Fallback when the reference can't be resolved (missing
+            // `referencedDeclaration`, or its definition wasn't in the build).
+            // Emitting the name lets the downstream encoder produce a clear error
+            // rather than failing silently here.
+            if (typeof typeName.name === "string") {
+                return typeName.name;
+            }
+            if (isObject(typeName.pathNode) &&
+                typeof typeName.pathNode.name === "string") {
+                const segments = typeName.pathNode.name.split(".");
+                return segments[segments.length - 1];
+            }
+            return undefined;
+        }
+        case "ArrayTypeName": {
+            const base = encodeMemberType(typeName.baseType, userDefinedValueTypeI);
+            if (base === undefined) {
+                return undefined;
+            }
+            // solc omits `length` entirely for dynamic arrays; it isn't emitted as `null`.
+            const length = typeName.length;
+            if (length === null || length === undefined) {
+                return `${base}[]`;
+            }
+            // Always read from typeString: `Literal.value` preserves source text
+            // (`0x100`, `1_000`) but typeString canonicalizes to decimal.
+            const desc = isObject(typeName.typeDescriptions)
+                ? typeName.typeDescriptions
+                : undefined;
+            const typeString = typeof desc?.typeString === "string" ? desc.typeString : "";
+            const match = /\[(\d+)\]$/.exec(typeString);
+            if (match !== null) {
+                return `${base}[${match[1]}]`;
+            }
+            return undefined;
+        }
+        case "Mapping":
+            return undefined;
+        case "FunctionTypeName":
+            // EIP-712 can't encode function types.
+            return undefined;
+        default:
+            return undefined;
+    }
+}
+//# sourceMappingURL=ast-walker.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ast-walker.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/ast-walker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAkC/D;;;;;;;;GAQG;AACH,MAAM,UAAU,8BAA8B,CAC5C,IAAe;IAEf,MAAM,KAAK,GAA8B,IAAI,GAAG,EAAE,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YACpD,SAAS;QACX,CAAC;QAED,MAAM,aAAa,GAAc,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,KAAK,gCAAgC,EAAE,CAAC;gBACvD,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1C,CAAC;iBAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAoB,EAAE,CAAC;gBAClD,MAAM,OAAO,GAAc,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,IACE,QAAQ,CAAC,MAAM,CAAC;wBAChB,MAAM,CAAC,QAAQ,KAAK,gCAAgC,EACpD,CAAC;wBACD,0BAA0B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAC5C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,0BAA0B,CACjC,IAA6B,EAC7B,KAAgC;IAEhC,IACE,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ;QAC3B,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,QAAQ,KAAK,oBAAoB,EACrD,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACnC,GAAY,EACZ,UAAkB,EAClB,wBAAmD,IAAI,GAAG,EAAE;IAE5D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QACpD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,MAAM,aAAa,GAAc,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3E,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACpB,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,kBAAkB,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,qBAAqB,CAAC,CAAC;YACzE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAoB,EAAE,CAAC;YAClD,MAAM,OAAO,GAAc,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,kBAAkB,EAAE,CAAC;oBAC/D,MAAM,SAAS,GAAG,aAAa,CAC7B,MAAM,EACN,UAAU,EACV,qBAAqB,CACtB,CAAC;oBACF,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;wBAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CACpB,IAA6B,EAC7B,UAAkB,EAClB,qBAAgD;IAEhD,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,WAAW,GAAc,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QACxD,CAAC,CAAC,IAAI,CAAC,OAAO;QACd,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IACE,CAAC,QAAQ,CAAC,UAAU,CAAC;YACrB,UAAU,CAAC,QAAQ,KAAK,qBAAqB,EAC7C,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,gBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE,qBAAqB,CAAC;SACnE,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO;QACP,UAAU;KACX,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAC9B,QAAiB,EACjB,wBAAmD,IAAI,GAAG,EAAE;IAE5D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,QAAQ,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC1B,KAAK,oBAAoB,CAAC,CAAC,CAAC;YAC1B,mEAAmE;YACnE,wEAAwE;YACxE,mEAAmE;YACnE,2EAA2E;YAC3E,sDAAsD;YACtD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC9C,CAAC,CAAC,QAAQ,CAAC,gBAAgB;gBAC3B,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,UAAU,GACd,OAAO,IAAI,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YACrE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC;oBACpC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;oBACzC,CAAC,CAAC,UAAU,CAAC;YACjB,CAAC;YAED,OAAO,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,CAAC;QAED,KAAK,qBAAqB,CAAC,CAAC,CAAC;YAC3B,sEAAsE;YACtE,qEAAqE;YACrE,oEAAoE;YACpE,iEAAiE;YACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC9C,CAAC,CAAC,QAAQ,CAAC,gBAAgB;gBAC3B,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,UAAU,GACd,OAAO,IAAI,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YAE9D,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,IAAI,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvC,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,mEAAmE;gBACnE,gEAAgE;gBAChE,mEAAmE;gBACnE,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC5D,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACrC,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACvC,CAAC;YAED,kEAAkE;YAClE,6DAA6D;YAC7D,gCAAgC;YAChC,mEAAmE;YACnE,2EAA2E;YAC3E,MAAM,KAAK,GACT,OAAO,QAAQ,CAAC,qBAAqB,KAAK,QAAQ;gBAChD,CAAC,CAAC,QAAQ,CAAC,qBAAqB;gBAChC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBACzB,OAAO,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,KAAK,QAAQ;oBAC7D,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB;oBACzC,CAAC,CAAC,SAAS,CAAC;YAElB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC7B,OAAO,gBAAgB,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YAED,yDAAyD;YACzD,mEAAmE;YACnE,sEAAsE;YACtE,qCAAqC;YACrC,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,QAAQ,CAAC,IAAI,CAAC;YACvB,CAAC;YAED,IACE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3B,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAC1C,CAAC;gBACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnD,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACvC,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;YACxE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,+EAA+E;YAC/E,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC/B,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC5C,OAAO,GAAG,IAAI,IAAI,CAAC;YACrB,CAAC;YAED,qEAAqE;YACrE,8DAA8D;YAC9D,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC9C,CAAC,CAAC,QAAQ,CAAC,gBAAgB;gBAC3B,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,UAAU,GACd,OAAO,IAAI,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE5C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO,GAAG,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;YAChC,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QAEnB,KAAK,kBAAkB;YACrB,uCAAuC;YACvC,OAAO,SAAS,CAAC;QAEnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,29 @@
+import type { CollectedStruct } from "./ast-walker.js";
+/**
+ * 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 declare function canonicalizeStructs(structs: CollectedStruct[], selectedNames: Set<string>): string[];
+//# sourceMappingURL=canonicalize.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"canonicalize.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/canonicalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIvD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GACzB,MAAM,EAAE,CA6BV"}