hardhat 3.4.5 → 3.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (215) hide show
  1. package/CHANGELOG.md +44 -0
  2. package/dist/src/config.d.ts +0 -1
  3. package/dist/src/config.d.ts.map +1 -1
  4. package/dist/src/config.js.map +1 -1
  5. package/dist/src/hre.d.ts +0 -1
  6. package/dist/src/hre.d.ts.map +1 -1
  7. package/dist/src/hre.js.map +1 -1
  8. package/dist/src/index.d.ts +0 -1
  9. package/dist/src/index.d.ts.map +1 -1
  10. package/dist/src/index.js.map +1 -1
  11. package/dist/src/internal/builtin-global-options.d.ts.map +1 -1
  12. package/dist/src/internal/builtin-global-options.js +1 -1
  13. package/dist/src/internal/builtin-global-options.js.map +1 -1
  14. package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts +21 -0
  15. package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.d.ts.map +1 -1
  16. package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js +49 -1
  17. package/dist/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.js.map +1 -1
  18. package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts +2 -1
  19. package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.d.ts.map +1 -1
  20. package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js +12 -2
  21. package/dist/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.js.map +1 -1
  22. package/dist/src/internal/builtin-plugins/network-manager/config-resolution.d.ts.map +1 -1
  23. package/dist/src/internal/builtin-plugins/network-manager/config-resolution.js +9 -2
  24. package/dist/src/internal/builtin-plugins/network-manager/config-resolution.js.map +1 -1
  25. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.d.ts +1 -0
  26. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.d.ts.map +1 -1
  27. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.js +1 -0
  28. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-constants.js.map +1 -1
  29. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.d.ts.map +1 -1
  30. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js +25 -5
  31. package/dist/src/internal/builtin-plugins/network-manager/edr/edr-provider.js.map +1 -1
  32. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.d.ts +16 -0
  33. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.d.ts.map +1 -1
  34. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js +28 -1
  35. package/dist/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.js.map +1 -1
  36. package/dist/src/internal/builtin-plugins/network-manager/network-manager.d.ts.map +1 -1
  37. package/dist/src/internal/builtin-plugins/network-manager/network-manager.js +2 -6
  38. package/dist/src/internal/builtin-plugins/network-manager/network-manager.js.map +1 -1
  39. package/dist/src/internal/builtin-plugins/network-manager/type-extensions/config.d.ts +5 -3
  40. package/dist/src/internal/builtin-plugins/network-manager/type-extensions/config.d.ts.map +1 -1
  41. package/dist/src/internal/builtin-plugins/network-manager/type-validation.d.ts.map +1 -1
  42. package/dist/src/internal/builtin-plugins/network-manager/type-validation.js +3 -1
  43. package/dist/src/internal/builtin-plugins/network-manager/type-validation.js.map +1 -1
  44. package/dist/src/internal/builtin-plugins/network-manager/utils/apply-coverage-network-overrides.d.ts +18 -0
  45. package/dist/src/internal/builtin-plugins/network-manager/utils/apply-coverage-network-overrides.d.ts.map +1 -0
  46. package/dist/src/internal/builtin-plugins/network-manager/utils/apply-coverage-network-overrides.js +27 -0
  47. package/dist/src/internal/builtin-plugins/network-manager/utils/apply-coverage-network-overrides.js.map +1 -0
  48. package/dist/src/internal/builtin-plugins/node/json-rpc/handler.js +6 -5
  49. package/dist/src/internal/builtin-plugins/node/json-rpc/handler.js.map +1 -1
  50. package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.d.ts.map +1 -1
  51. package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.js +1 -1
  52. package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.js.map +1 -1
  53. package/dist/src/internal/builtin-plugins/solidity/constants.d.ts +10 -0
  54. package/dist/src/internal/builtin-plugins/solidity/constants.d.ts.map +1 -1
  55. package/dist/src/internal/builtin-plugins/solidity/constants.js +10 -0
  56. package/dist/src/internal/builtin-plugins/solidity/constants.js.map +1 -1
  57. package/dist/src/internal/builtin-plugins/solidity/index.d.ts.map +1 -1
  58. package/dist/src/internal/builtin-plugins/solidity/index.js +1 -0
  59. package/dist/src/internal/builtin-plugins/solidity/index.js.map +1 -1
  60. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.d.ts +9 -0
  61. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.d.ts.map +1 -0
  62. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.js +10 -0
  63. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.js.map +1 -0
  64. package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts +4 -3
  65. package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts.map +1 -1
  66. package/dist/src/internal/builtin-plugins/solidity-test/config.js +55 -8
  67. package/dist/src/internal/builtin-plugins/solidity-test/config.js.map +1 -1
  68. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.d.ts +58 -0
  69. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.d.ts.map +1 -0
  70. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.js +226 -0
  71. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.js.map +1 -0
  72. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.d.ts +29 -0
  73. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.d.ts.map +1 -0
  74. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js +244 -0
  75. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js.map +1 -0
  76. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.d.ts +7 -0
  77. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.d.ts.map +1 -0
  78. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.js +204 -0
  79. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.js.map +1 -0
  80. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts +21 -0
  81. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts.map +1 -0
  82. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js +77 -0
  83. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js.map +1 -0
  84. package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts +4 -3
  85. package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map +1 -1
  86. package/dist/src/internal/builtin-plugins/solidity-test/helpers.js +20 -3
  87. package/dist/src/internal/builtin-plugins/solidity-test/helpers.js.map +1 -1
  88. package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts.map +1 -1
  89. package/dist/src/internal/builtin-plugins/solidity-test/task-action.js +5 -1
  90. package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
  91. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.d.ts +2 -0
  92. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.d.ts.map +1 -0
  93. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.js +2 -0
  94. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.js.map +1 -0
  95. package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts +91 -32
  96. package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts.map +1 -1
  97. package/dist/src/internal/cli/init/init.d.ts +31 -6
  98. package/dist/src/internal/cli/init/init.d.ts.map +1 -1
  99. package/dist/src/internal/cli/init/init.js +121 -10
  100. package/dist/src/internal/cli/init/init.js.map +1 -1
  101. package/dist/src/internal/cli/main.d.ts.map +1 -1
  102. package/dist/src/internal/cli/main.js +41 -1
  103. package/dist/src/internal/cli/main.js.map +1 -1
  104. package/dist/src/types/arguments.d.ts +1 -0
  105. package/dist/src/types/arguments.d.ts.map +1 -1
  106. package/dist/src/types/arguments.js +1 -0
  107. package/dist/src/types/arguments.js.map +1 -1
  108. package/dist/src/types/artifacts.d.ts +1 -0
  109. package/dist/src/types/artifacts.d.ts.map +1 -1
  110. package/dist/src/types/artifacts.js +1 -1
  111. package/dist/src/types/artifacts.js.map +1 -1
  112. package/dist/src/types/builtin-plugin-type-extensions.d.ts +2 -0
  113. package/dist/src/types/builtin-plugin-type-extensions.d.ts.map +1 -0
  114. package/dist/src/types/builtin-plugin-type-extensions.js +2 -0
  115. package/dist/src/types/builtin-plugin-type-extensions.js.map +1 -0
  116. package/dist/src/types/config.d.ts +1 -0
  117. package/dist/src/types/config.d.ts.map +1 -1
  118. package/dist/src/types/config.js +1 -1
  119. package/dist/src/types/config.js.map +1 -1
  120. package/dist/src/types/global-options.d.ts +1 -0
  121. package/dist/src/types/global-options.d.ts.map +1 -1
  122. package/dist/src/types/global-options.js +1 -1
  123. package/dist/src/types/global-options.js.map +1 -1
  124. package/dist/src/types/hooks.d.ts +1 -0
  125. package/dist/src/types/hooks.d.ts.map +1 -1
  126. package/dist/src/types/hooks.js +1 -1
  127. package/dist/src/types/hooks.js.map +1 -1
  128. package/dist/src/types/hre.d.ts +1 -0
  129. package/dist/src/types/hre.d.ts.map +1 -1
  130. package/dist/src/types/hre.js +1 -1
  131. package/dist/src/types/hre.js.map +1 -1
  132. package/dist/src/types/index.d.ts +1 -0
  133. package/dist/src/types/index.d.ts.map +1 -1
  134. package/dist/src/types/index.js +1 -0
  135. package/dist/src/types/index.js.map +1 -1
  136. package/dist/src/types/network.d.ts +1 -0
  137. package/dist/src/types/network.d.ts.map +1 -1
  138. package/dist/src/types/network.js +1 -1
  139. package/dist/src/types/network.js.map +1 -1
  140. package/dist/src/types/plugins.d.ts +1 -1
  141. package/dist/src/types/plugins.d.ts.map +1 -1
  142. package/dist/src/types/plugins.js +1 -1
  143. package/dist/src/types/plugins.js.map +1 -1
  144. package/dist/src/types/providers.d.ts +1 -0
  145. package/dist/src/types/providers.d.ts.map +1 -1
  146. package/dist/src/types/providers.js +1 -1
  147. package/dist/src/types/providers.js.map +1 -1
  148. package/dist/src/types/solidity.d.ts +1 -0
  149. package/dist/src/types/solidity.d.ts.map +1 -1
  150. package/dist/src/types/solidity.js +1 -0
  151. package/dist/src/types/solidity.js.map +1 -1
  152. package/dist/src/types/tasks.d.ts +1 -0
  153. package/dist/src/types/tasks.d.ts.map +1 -1
  154. package/dist/src/types/tasks.js +1 -0
  155. package/dist/src/types/tasks.js.map +1 -1
  156. package/dist/src/types/test.d.ts +1 -0
  157. package/dist/src/types/test.d.ts.map +1 -1
  158. package/dist/src/types/test.js +1 -1
  159. package/dist/src/types/test.js.map +1 -1
  160. package/dist/src/types/user-interruptions.d.ts +1 -0
  161. package/dist/src/types/user-interruptions.d.ts.map +1 -1
  162. package/dist/src/types/user-interruptions.js +1 -1
  163. package/dist/src/types/user-interruptions.js.map +1 -1
  164. package/package.json +12 -11
  165. package/src/config.ts +0 -2
  166. package/src/hre.ts +0 -3
  167. package/src/index.ts +0 -3
  168. package/src/internal/builtin-global-options.ts +2 -1
  169. package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts +90 -1
  170. package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts +24 -2
  171. package/src/internal/builtin-plugins/network-manager/config-resolution.ts +11 -3
  172. package/src/internal/builtin-plugins/network-manager/edr/edr-constants.ts +2 -0
  173. package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts +38 -8
  174. package/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts +43 -1
  175. package/src/internal/builtin-plugins/network-manager/network-manager.ts +5 -6
  176. package/src/internal/builtin-plugins/network-manager/type-extensions/config.ts +5 -3
  177. package/src/internal/builtin-plugins/network-manager/type-validation.ts +7 -1
  178. package/src/internal/builtin-plugins/network-manager/utils/apply-coverage-network-overrides.ts +32 -0
  179. package/src/internal/builtin-plugins/node/json-rpc/handler.ts +7 -5
  180. package/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.ts +1 -2
  181. package/src/internal/builtin-plugins/solidity/constants.ts +11 -0
  182. package/src/internal/builtin-plugins/solidity/index.ts +1 -0
  183. package/src/internal/builtin-plugins/solidity/tasks/compile.ts +12 -0
  184. package/src/internal/builtin-plugins/solidity-test/config.ts +85 -12
  185. package/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.ts +324 -0
  186. package/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.ts +317 -0
  187. package/src/internal/builtin-plugins/solidity-test/eip712/glob.ts +225 -0
  188. package/src/internal/builtin-plugins/solidity-test/eip712/index.ts +120 -0
  189. package/src/internal/builtin-plugins/solidity-test/helpers.ts +28 -4
  190. package/src/internal/builtin-plugins/solidity-test/task-action.ts +12 -1
  191. package/src/internal/builtin-plugins/solidity-test/test-profiles.ts +1 -0
  192. package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +100 -33
  193. package/src/internal/cli/init/init.ts +198 -16
  194. package/src/internal/cli/main.ts +64 -1
  195. package/src/types/arguments.ts +2 -0
  196. package/src/types/artifacts.ts +2 -0
  197. package/src/types/builtin-plugin-type-extensions.ts +15 -0
  198. package/src/types/config.ts +2 -0
  199. package/src/types/global-options.ts +2 -0
  200. package/src/types/hooks.ts +2 -0
  201. package/src/types/hre.ts +2 -0
  202. package/src/types/index.ts +2 -0
  203. package/src/types/network.ts +2 -0
  204. package/src/types/plugins.ts +1 -2
  205. package/src/types/providers.ts +2 -0
  206. package/src/types/solidity.ts +2 -0
  207. package/src/types/tasks.ts +2 -0
  208. package/src/types/test.ts +2 -0
  209. package/src/types/user-interruptions.ts +2 -0
  210. package/templates/hardhat-3/01-node-test-runner-viem/package.json +11 -11
  211. package/templates/hardhat-3/01-node-test-runner-viem/tsconfig.json +4 -7
  212. package/templates/hardhat-3/02-mocha-ethers/package.json +13 -13
  213. package/templates/hardhat-3/02-mocha-ethers/tsconfig.json +4 -7
  214. package/templates/hardhat-3/03-minimal/package.json +2 -2
  215. package/templates/hardhat-3/03-minimal/tsconfig.json +4 -7
@@ -0,0 +1,226 @@
1
+ import { isObject } from "@nomicfoundation/hardhat-utils/lang";
2
+ /**
3
+ * Walks every AST in the build and indexes every `UserDefinedValueTypeDefinition`
4
+ * by its node `id`, mapping to its `underlyingType` (an `ElementaryTypeName`).
5
+ *
6
+ * User-defined value types can sit at file scope or inside a contract, and a
7
+ * struct in one source may reference a user-defined value type defined in
8
+ * another, so this must run across every AST in the build — not just the ones
9
+ * matched by the user's include globs.
10
+ */
11
+ export function buildUserDefinedValueTypeIndex(asts) {
12
+ const index = new Map();
13
+ for (const ast of asts) {
14
+ if (!isObject(ast) || ast.nodeType !== "SourceUnit") {
15
+ continue;
16
+ }
17
+ const topLevelNodes = Array.isArray(ast.nodes) ? ast.nodes : [];
18
+ for (const node of topLevelNodes) {
19
+ if (!isObject(node)) {
20
+ continue;
21
+ }
22
+ if (node.nodeType === "UserDefinedValueTypeDefinition") {
23
+ recordUserDefinedValueType(node, index);
24
+ }
25
+ else if (node.nodeType === "ContractDefinition") {
26
+ const members = Array.isArray(node.nodes) ? node.nodes : [];
27
+ for (const member of members) {
28
+ if (isObject(member) &&
29
+ member.nodeType === "UserDefinedValueTypeDefinition") {
30
+ recordUserDefinedValueType(member, index);
31
+ }
32
+ }
33
+ }
34
+ }
35
+ }
36
+ return index;
37
+ }
38
+ function recordUserDefinedValueType(node, index) {
39
+ if (typeof node.id === "number" &&
40
+ isObject(node.underlyingType) &&
41
+ node.underlyingType.nodeType === "ElementaryTypeName") {
42
+ index.set(node.id, node.underlyingType);
43
+ }
44
+ }
45
+ /**
46
+ * Returns every struct definition reachable from a solc source AST (Abstract Syntax Tree),
47
+ * including structs nested inside contracts.
48
+ */
49
+ export function extractStructsFromAst(ast, sourcePath, userDefinedValueTypeI = new Map()) {
50
+ if (!isObject(ast) || ast.nodeType !== "SourceUnit") {
51
+ return [];
52
+ }
53
+ const results = [];
54
+ const topLevelNodes = Array.isArray(ast.nodes) ? ast.nodes : [];
55
+ for (const node of topLevelNodes) {
56
+ if (!isObject(node)) {
57
+ continue;
58
+ }
59
+ if (node.nodeType === "StructDefinition") {
60
+ const collected = collectStruct(node, sourcePath, userDefinedValueTypeI);
61
+ if (collected !== undefined) {
62
+ results.push(collected);
63
+ }
64
+ }
65
+ else if (node.nodeType === "ContractDefinition") {
66
+ const members = Array.isArray(node.nodes) ? node.nodes : [];
67
+ for (const member of members) {
68
+ if (isObject(member) && member.nodeType === "StructDefinition") {
69
+ const collected = collectStruct(member, sourcePath, userDefinedValueTypeI);
70
+ if (collected !== undefined) {
71
+ results.push(collected);
72
+ }
73
+ }
74
+ }
75
+ }
76
+ }
77
+ return results;
78
+ }
79
+ function collectStruct(node, sourcePath, userDefinedValueTypeI) {
80
+ if (typeof node.name !== "string") {
81
+ return undefined;
82
+ }
83
+ const memberNodes = Array.isArray(node.members)
84
+ ? node.members
85
+ : [];
86
+ const members = [];
87
+ for (const memberNode of memberNodes) {
88
+ if (!isObject(memberNode) ||
89
+ memberNode.nodeType !== "VariableDeclaration") {
90
+ continue;
91
+ }
92
+ if (typeof memberNode.name !== "string") {
93
+ continue;
94
+ }
95
+ members.push({
96
+ name: memberNode.name,
97
+ type: encodeMemberType(memberNode.typeName, userDefinedValueTypeI),
98
+ });
99
+ }
100
+ return {
101
+ name: node.name,
102
+ members,
103
+ sourcePath,
104
+ };
105
+ }
106
+ /**
107
+ * Converts a solc `typeName` AST node into its EIP-712 type string, following
108
+ * the same conventions as `forge bind-json`:
109
+ *
110
+ * - elementary types pass through (`address`, `uint256`, `string`, ...)
111
+ * - enums → `uint8`
112
+ * - contracts / interfaces → `address`
113
+ * - structs → bare name (`Wallet.Person` → `Person`)
114
+ * - user-defined value types → underlying elementary type (`type Foo is bytes32` → `bytes32`)
115
+ * - arrays → `T[]` (dynamic) or `T[N]` (fixed)
116
+ * - mappings / functions → `undefined` (not EIP-712 encodable)
117
+ */
118
+ export function encodeMemberType(typeName, userDefinedValueTypeI = new Map()) {
119
+ if (!isObject(typeName)) {
120
+ return undefined;
121
+ }
122
+ switch (typeName.nodeType) {
123
+ case "ElementaryTypeName": {
124
+ // Prefer `typeDescriptions.typeString` over `name`: solc emits the
125
+ // unresolved alias in `name` (`uint`, `int`, `byte`), but the canonical
126
+ // EIP-712 type is in `typeString` (`uint256`, `int256`, `bytes1`).
127
+ // `address payable` is the exception — `typeString` is `"address payable"`
128
+ // while the canonical EIP-712 type is just `address`.
129
+ const desc = isObject(typeName.typeDescriptions)
130
+ ? typeName.typeDescriptions
131
+ : undefined;
132
+ const typeString = typeof desc?.typeString === "string" ? desc.typeString : undefined;
133
+ if (typeString !== undefined) {
134
+ return typeString.endsWith(" payable")
135
+ ? typeString.slice(0, -" payable".length)
136
+ : typeString;
137
+ }
138
+ return typeof typeName.name === "string" ? typeName.name : undefined;
139
+ }
140
+ case "UserDefinedTypeName": {
141
+ // `typeDescriptions.typeString` is the only reliable way to tell what
142
+ // kind of user-defined type this is — e.g. "struct Foo", "enum Bar",
143
+ // "contract Token". The AST node itself doesn't say. Note that solc
144
+ // emits the "contract " prefix for interface references as well.
145
+ const desc = isObject(typeName.typeDescriptions)
146
+ ? typeName.typeDescriptions
147
+ : undefined;
148
+ const typeString = typeof desc?.typeString === "string" ? desc.typeString : "";
149
+ if (typeString.startsWith("enum ")) {
150
+ return "uint8";
151
+ }
152
+ if (typeString.startsWith("contract ")) {
153
+ return "address";
154
+ }
155
+ if (typeString.startsWith("struct ")) {
156
+ // EIP-712 references structs by their bare name, so strip both the
157
+ // "struct " prefix, any storage-location suffix solc may append
158
+ // ("memory", "storage", ...), and any qualifier ("Wallet.Person").
159
+ const remainder = typeString.slice("struct ".length).trim();
160
+ const namePart = remainder.split(/\s+/)[0];
161
+ const segments = namePart.split(".");
162
+ return segments[segments.length - 1];
163
+ }
164
+ // User-defined value types (`type Foo is bytes32;`, solc 0.8.8+).
165
+ // Resolve via `referencedDeclaration` against the build-wide
166
+ // user-defined value type index
167
+ // and recurse on the underlying elementary type — matching forge's
168
+ // `Resolver::resolve_type` so `Foo h` encodes as `bytes32 h`, not `Foo h`.
169
+ const refId = typeof typeName.referencedDeclaration === "number"
170
+ ? typeName.referencedDeclaration
171
+ : isObject(typeName.pathNode) &&
172
+ typeof typeName.pathNode.referencedDeclaration === "number"
173
+ ? typeName.pathNode.referencedDeclaration
174
+ : undefined;
175
+ if (refId !== undefined) {
176
+ const underlying = userDefinedValueTypeI.get(refId);
177
+ if (underlying !== undefined) {
178
+ return encodeMemberType(underlying, userDefinedValueTypeI);
179
+ }
180
+ }
181
+ // Fallback when the reference can't be resolved (missing
182
+ // `referencedDeclaration`, or its definition wasn't in the build).
183
+ // Emitting the name lets the downstream encoder produce a clear error
184
+ // rather than failing silently here.
185
+ if (typeof typeName.name === "string") {
186
+ return typeName.name;
187
+ }
188
+ if (isObject(typeName.pathNode) &&
189
+ typeof typeName.pathNode.name === "string") {
190
+ const segments = typeName.pathNode.name.split(".");
191
+ return segments[segments.length - 1];
192
+ }
193
+ return undefined;
194
+ }
195
+ case "ArrayTypeName": {
196
+ const base = encodeMemberType(typeName.baseType, userDefinedValueTypeI);
197
+ if (base === undefined) {
198
+ return undefined;
199
+ }
200
+ // solc omits `length` entirely for dynamic arrays; it isn't emitted as `null`.
201
+ const length = typeName.length;
202
+ if (length === null || length === undefined) {
203
+ return `${base}[]`;
204
+ }
205
+ // Always read from typeString: `Literal.value` preserves source text
206
+ // (`0x100`, `1_000`) but typeString canonicalizes to decimal.
207
+ const desc = isObject(typeName.typeDescriptions)
208
+ ? typeName.typeDescriptions
209
+ : undefined;
210
+ const typeString = typeof desc?.typeString === "string" ? desc.typeString : "";
211
+ const match = /\[(\d+)\]$/.exec(typeString);
212
+ if (match !== null) {
213
+ return `${base}[${match[1]}]`;
214
+ }
215
+ return undefined;
216
+ }
217
+ case "Mapping":
218
+ return undefined;
219
+ case "FunctionTypeName":
220
+ // EIP-712 can't encode function types.
221
+ return undefined;
222
+ default:
223
+ return undefined;
224
+ }
225
+ }
226
+ //# sourceMappingURL=ast-walker.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ast-walker.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/ast-walker.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,29 @@
1
+ import type { CollectedStruct } from "./ast-walker.js";
2
+ /**
3
+ * Produces the flat list of canonical EIP-712 type strings expected by EDR.
4
+ *
5
+ * Each encodable struct contributes one entry, built like this:
6
+ * 1. Start with the struct's own head: `Name(type1 name1,type2 name2,...)`.
7
+ * 2. If the struct has fields that reference other structs, append those
8
+ * structs' heads after it, sorted alphabetically.
9
+ *
10
+ * Examples:
11
+ * - `Person` has only primitive fields (address, string), so its entry is
12
+ * just its own head:
13
+ * `Person(address wallet,string name)`
14
+ * - `Mail` has a `Person` field, so its entry is its head plus `Person`'s
15
+ * head appended:
16
+ * `Mail(Person from,Person to,string contents)Person(address wallet,string name)`
17
+ *
18
+ * Structs that contain members whose type cannot be EIP-712 encoded (mappings,
19
+ * function types, etc.) are dropped entirely, along with any structs that
20
+ * depend on them transitively. This matches `forge bind-json`'s behavior:
21
+ * `resolve_struct_eip712` returns `None` for any struct containing unsupported
22
+ * constructs and propagates `None` through the dep graph so dependents are
23
+ * also dropped.
24
+ *
25
+ * Only names in `selectedNames` are emitted; non-selected structs still
26
+ * participate in dep resolution so cross-file deps inline correctly.
27
+ */
28
+ export declare function canonicalizeStructs(structs: CollectedStruct[], selectedNames: Set<string>): string[];
29
+ //# sourceMappingURL=canonicalize.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,244 @@
1
+ import { HardhatError } from "@nomicfoundation/hardhat-errors";
2
+ /**
3
+ * Produces the flat list of canonical EIP-712 type strings expected by EDR.
4
+ *
5
+ * Each encodable struct contributes one entry, built like this:
6
+ * 1. Start with the struct's own head: `Name(type1 name1,type2 name2,...)`.
7
+ * 2. If the struct has fields that reference other structs, append those
8
+ * structs' heads after it, sorted alphabetically.
9
+ *
10
+ * Examples:
11
+ * - `Person` has only primitive fields (address, string), so its entry is
12
+ * just its own head:
13
+ * `Person(address wallet,string name)`
14
+ * - `Mail` has a `Person` field, so its entry is its head plus `Person`'s
15
+ * head appended:
16
+ * `Mail(Person from,Person to,string contents)Person(address wallet,string name)`
17
+ *
18
+ * Structs that contain members whose type cannot be EIP-712 encoded (mappings,
19
+ * function types, etc.) are dropped entirely, along with any structs that
20
+ * depend on them transitively. This matches `forge bind-json`'s behavior:
21
+ * `resolve_struct_eip712` returns `None` for any struct containing unsupported
22
+ * constructs and propagates `None` through the dep graph so dependents are
23
+ * also dropped.
24
+ *
25
+ * Only names in `selectedNames` are emitted; non-selected structs still
26
+ * participate in dep resolution so cross-file deps inline correctly.
27
+ */
28
+ export function canonicalizeStructs(structs, selectedNames) {
29
+ const byName = indexByName(structs, selectedNames);
30
+ const knownNames = new Set(byName.keys());
31
+ const encodable = computeEncodable(byName, knownNames);
32
+ const result = [];
33
+ for (const struct of byName.values()) {
34
+ if (!selectedNames.has(struct.name)) {
35
+ continue;
36
+ }
37
+ if (!encodable.has(struct.name)) {
38
+ continue;
39
+ }
40
+ const head = encodeStructHead(struct);
41
+ const deps = transitiveDeps(struct, byName)
42
+ .map((depName) => {
43
+ const def = byName.get(depName);
44
+ return def === undefined ? undefined : encodeStructHead(def);
45
+ })
46
+ .filter((s) => s !== undefined);
47
+ deps.sort();
48
+ result.push(head + deps.join(""));
49
+ }
50
+ return result;
51
+ }
52
+ /**
53
+ * Returns the set of struct names that are EIP-712 encodable. A struct is
54
+ * encodable if none of its members has a non-decodable type (`type === undefined`,
55
+ * e.g. mappings or function types) AND every one of its struct deps — direct or
56
+ * transitive — is itself encodable.
57
+ */
58
+ function computeEncodable(byName, knownNames) {
59
+ const encodable = new Set(byName.keys());
60
+ for (const [name, struct] of byName) {
61
+ if (struct.members.some((m) => m.type === undefined)) {
62
+ encodable.delete(name);
63
+ }
64
+ }
65
+ const depsByName = new Map();
66
+ for (const [name, struct] of byName) {
67
+ depsByName.set(name, directStructDeps(struct, knownNames));
68
+ }
69
+ let changed = true;
70
+ while (changed) {
71
+ changed = false;
72
+ for (const name of [...encodable]) {
73
+ const deps = depsByName.get(name) ?? [];
74
+ if (deps.some((dep) => !encodable.has(dep))) {
75
+ encodable.delete(name);
76
+ changed = true;
77
+ }
78
+ }
79
+ }
80
+ return encodable;
81
+ }
82
+ /**
83
+ * Computes the EIP-712 `encodeType` string for one struct in isolation:
84
+ * `Name(type1 name1,type2 name2,...)`.
85
+ * Members whose type is `undefined` (e.g. mappings) are dropped.
86
+ */
87
+ function encodeStructHead(struct) {
88
+ const memberSegments = [];
89
+ for (const member of struct.members) {
90
+ if (member.type === undefined) {
91
+ continue;
92
+ }
93
+ memberSegments.push(`${member.type} ${member.name}`);
94
+ }
95
+ return `${struct.name}(${memberSegments.join(",")})`;
96
+ }
97
+ /**
98
+ * Returns the names of all struct dependencies referenced by `struct`'s
99
+ * members. Considers the base type of arrays. Members whose base type does not
100
+ * resolve to a known struct (elementary types, address, etc.) are ignored.
101
+ */
102
+ function directStructDeps(struct, knownStructNames) {
103
+ const deps = new Set();
104
+ for (const member of struct.members) {
105
+ if (member.type === undefined) {
106
+ continue;
107
+ }
108
+ // Strip array suffixes: `Foo[]`, `Foo[3]`, `Foo[3][2]` → `Foo`.
109
+ const base = member.type.split("[")[0];
110
+ if (knownStructNames.has(base) && base !== struct.name) {
111
+ deps.add(base);
112
+ }
113
+ }
114
+ return [...deps];
115
+ }
116
+ /**
117
+ * Walks the dep graph from `root` and returns the set of all transitively
118
+ * referenced struct names (excluding the root itself).
119
+ */
120
+ function transitiveDeps(root, byName) {
121
+ const visited = new Set();
122
+ const knownNames = new Set(byName.keys());
123
+ const stack = directStructDeps(root, knownNames);
124
+ while (stack.length > 0) {
125
+ const next = stack.pop();
126
+ if (next === undefined || visited.has(next) || next === root.name) {
127
+ continue;
128
+ }
129
+ visited.add(next);
130
+ const def = byName.get(next);
131
+ if (def !== undefined) {
132
+ stack.push(...directStructDeps(def, knownNames));
133
+ }
134
+ }
135
+ return [...visited];
136
+ }
137
+ /**
138
+ * Builds a name → definition map from collected structs, throwing
139
+ * `EIP712_DUPLICATE_STRUCT_NAME` when two structs share a name but have
140
+ * different member lists. Definitions with identical members are silently
141
+ * deduplicated (same struct seen across multiple build infos / partial
142
+ * recompiles).
143
+ *
144
+ * The comparison uses the full member list — including members whose type
145
+ * isn't EIP-712 encodable (mappings, function types) — so that two structs
146
+ * differing only in unsupported members are detected as conflicting rather
147
+ * than collapsed into one. Comparing only the encoded head would let a
148
+ * non decodable definition silently win over an encodable one, dropping the
149
+ * struct from the canonical output.
150
+ *
151
+ * Conflicts on a name reachable from any selected struct (selected roots plus
152
+ * their transitive deps) throw, since the selected struct's inlined dep head
153
+ * would otherwise depend on which conflicting copy happened to be seen first.
154
+ * Conflicts on names truly unreachable from the selected set are silently
155
+ * deduped (first wins). Selected structs are processed first so they win over
156
+ * non-selected copies.
157
+ */
158
+ function indexByName(structs, selectedNames) {
159
+ const byName = new Map();
160
+ const fingerprintByName = new Map();
161
+ const sourceByName = new Map();
162
+ const deferredConflicts = new Map();
163
+ const ordered = [
164
+ ...structs.filter((s) => selectedNames.has(s.name)),
165
+ ...structs.filter((s) => !selectedNames.has(s.name)),
166
+ ];
167
+ for (const struct of ordered) {
168
+ const fingerprint = fingerprintStruct(struct);
169
+ const existingFingerprint = fingerprintByName.get(struct.name);
170
+ if (existingFingerprint === undefined) {
171
+ byName.set(struct.name, struct);
172
+ fingerprintByName.set(struct.name, fingerprint);
173
+ sourceByName.set(struct.name, struct.sourcePath);
174
+ continue;
175
+ }
176
+ if (existingFingerprint === fingerprint) {
177
+ continue;
178
+ }
179
+ if (!selectedNames.has(struct.name)) {
180
+ if (!deferredConflicts.has(struct.name)) {
181
+ deferredConflicts.set(struct.name, {
182
+ firstSource: sourceByName.get(struct.name) ?? "<unknown>",
183
+ secondSource: struct.sourcePath,
184
+ });
185
+ }
186
+ continue;
187
+ }
188
+ throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.EIP712_DUPLICATE_STRUCT_NAME, {
189
+ name: struct.name,
190
+ firstSource: sourceByName.get(struct.name) ?? "<unknown>",
191
+ secondSource: struct.sourcePath,
192
+ });
193
+ }
194
+ if (deferredConflicts.size > 0) {
195
+ const reachable = reachableFromSelected(byName, selectedNames);
196
+ for (const [name, sources] of deferredConflicts) {
197
+ if (reachable.has(name)) {
198
+ throw new HardhatError(HardhatError.ERRORS.CORE.SOLIDITY_TESTS.EIP712_DUPLICATE_STRUCT_NAME, { name, ...sources });
199
+ }
200
+ }
201
+ }
202
+ return byName;
203
+ }
204
+ /**
205
+ * Set of struct names transitively referenced by any struct in `selectedNames`.
206
+ * The walk uses whatever first-wins definition is in `byName`; that's enough
207
+ * for conflict detection since we only need to know whether a name is
208
+ * reachable, not which conflicting copy is the "right" one.
209
+ */
210
+ function reachableFromSelected(byName, selectedNames) {
211
+ const knownNames = new Set(byName.keys());
212
+ const reachable = new Set();
213
+ const stack = [];
214
+ for (const name of selectedNames) {
215
+ const root = byName.get(name);
216
+ if (root !== undefined) {
217
+ stack.push(...directStructDeps(root, knownNames));
218
+ }
219
+ }
220
+ while (stack.length > 0) {
221
+ const next = stack.pop();
222
+ if (next === undefined || reachable.has(next)) {
223
+ continue;
224
+ }
225
+ reachable.add(next);
226
+ const def = byName.get(next);
227
+ if (def !== undefined) {
228
+ stack.push(...directStructDeps(def, knownNames));
229
+ }
230
+ }
231
+ return reachable;
232
+ }
233
+ /**
234
+ * A stable string capturing every member of `struct`, used to detect
235
+ * conflicting definitions of the same name. Unlike `encodeStructHead`, this
236
+ * preserves members whose type can't be EIP-712 encoded — they're emitted with
237
+ * an `<unsupported>` sentinel — so structs that differ only in mapping or
238
+ * function-type members aren't collapsed together.
239
+ */
240
+ function fingerprintStruct(struct) {
241
+ const segments = struct.members.map((m) => `${m.type ?? "<unsupported>"} ${m.name}`);
242
+ return `${struct.name}(${segments.join(",")})`;
243
+ }
244
+ //# sourceMappingURL=canonicalize.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"canonicalize.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity-test/eip712/canonicalize.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Returns true when `path` should be included given user-supplied include and
3
+ * exclude glob lists. `include` is the gate: an empty `include` matches
4
+ * nothing. `exclude` then narrows the included set.
5
+ */
6
+ export declare function isPathSelected(path: string, include: string[], exclude: string[]): boolean;
7
+ //# sourceMappingURL=glob.d.ts.map
@@ -0,0 +1 @@
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"}