hardhat 3.4.5 → 3.5.1

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 (248) hide show
  1. package/CHANGELOG.md +54 -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/build-system.d.ts +1 -4
  51. package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.d.ts.map +1 -1
  52. package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js +1 -11
  53. package/dist/src/internal/builtin-plugins/solidity/build-system/build-system.js.map +1 -1
  54. package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.d.ts.map +1 -1
  55. package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.js +1 -1
  56. package/dist/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.js.map +1 -1
  57. package/dist/src/internal/builtin-plugins/solidity/build-system/warning-suppression.d.ts +6 -10
  58. package/dist/src/internal/builtin-plugins/solidity/build-system/warning-suppression.d.ts.map +1 -1
  59. package/dist/src/internal/builtin-plugins/solidity/build-system/warning-suppression.js +54 -43
  60. package/dist/src/internal/builtin-plugins/solidity/build-system/warning-suppression.js.map +1 -1
  61. package/dist/src/internal/builtin-plugins/solidity/constants.d.ts +10 -0
  62. package/dist/src/internal/builtin-plugins/solidity/constants.d.ts.map +1 -1
  63. package/dist/src/internal/builtin-plugins/solidity/constants.js +10 -0
  64. package/dist/src/internal/builtin-plugins/solidity/constants.js.map +1 -1
  65. package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.d.ts.map +1 -1
  66. package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.js +2 -1
  67. package/dist/src/internal/builtin-plugins/solidity/hook-handlers/hre.js.map +1 -1
  68. package/dist/src/internal/builtin-plugins/solidity/index.d.ts.map +1 -1
  69. package/dist/src/internal/builtin-plugins/solidity/index.js +1 -0
  70. package/dist/src/internal/builtin-plugins/solidity/index.js.map +1 -1
  71. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.d.ts +9 -0
  72. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.d.ts.map +1 -0
  73. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.js +10 -0
  74. package/dist/src/internal/builtin-plugins/solidity/tasks/compile.js.map +1 -0
  75. package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts +4 -3
  76. package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts.map +1 -1
  77. package/dist/src/internal/builtin-plugins/solidity-test/config.js +55 -8
  78. package/dist/src/internal/builtin-plugins/solidity-test/config.js.map +1 -1
  79. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.d.ts +58 -0
  80. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.d.ts.map +1 -0
  81. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.js +226 -0
  82. package/dist/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.js.map +1 -0
  83. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.d.ts +29 -0
  84. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.d.ts.map +1 -0
  85. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js +244 -0
  86. package/dist/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.js.map +1 -0
  87. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.d.ts +7 -0
  88. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.d.ts.map +1 -0
  89. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.js +204 -0
  90. package/dist/src/internal/builtin-plugins/solidity-test/eip712/glob.js.map +1 -0
  91. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts +21 -0
  92. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.d.ts.map +1 -0
  93. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js +77 -0
  94. package/dist/src/internal/builtin-plugins/solidity-test/eip712/index.js.map +1 -0
  95. package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts +4 -3
  96. package/dist/src/internal/builtin-plugins/solidity-test/helpers.d.ts.map +1 -1
  97. package/dist/src/internal/builtin-plugins/solidity-test/helpers.js +20 -3
  98. package/dist/src/internal/builtin-plugins/solidity-test/helpers.js.map +1 -1
  99. package/dist/src/internal/builtin-plugins/solidity-test/task-action.d.ts.map +1 -1
  100. package/dist/src/internal/builtin-plugins/solidity-test/task-action.js +5 -1
  101. package/dist/src/internal/builtin-plugins/solidity-test/task-action.js.map +1 -1
  102. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.d.ts +2 -0
  103. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.d.ts.map +1 -0
  104. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.js +2 -0
  105. package/dist/src/internal/builtin-plugins/solidity-test/test-profiles.js.map +1 -0
  106. package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts +91 -32
  107. package/dist/src/internal/builtin-plugins/solidity-test/type-extensions.d.ts.map +1 -1
  108. package/dist/src/internal/cli/error-handler.d.ts +11 -2
  109. package/dist/src/internal/cli/error-handler.d.ts.map +1 -1
  110. package/dist/src/internal/cli/error-handler.js +72 -46
  111. package/dist/src/internal/cli/error-handler.js.map +1 -1
  112. package/dist/src/internal/cli/init/init.d.ts +31 -6
  113. package/dist/src/internal/cli/init/init.d.ts.map +1 -1
  114. package/dist/src/internal/cli/init/init.js +126 -13
  115. package/dist/src/internal/cli/init/init.js.map +1 -1
  116. package/dist/src/internal/cli/init/package-manager.d.ts +7 -1
  117. package/dist/src/internal/cli/init/package-manager.d.ts.map +1 -1
  118. package/dist/src/internal/cli/init/package-manager.js +14 -2
  119. package/dist/src/internal/cli/init/package-manager.js.map +1 -1
  120. package/dist/src/internal/cli/main.d.ts.map +1 -1
  121. package/dist/src/internal/cli/main.js +42 -2
  122. package/dist/src/internal/cli/main.js.map +1 -1
  123. package/dist/src/internal/cli/telemetry/error-classification/classifier.d.ts +2 -1
  124. package/dist/src/internal/cli/telemetry/error-classification/classifier.d.ts.map +1 -1
  125. package/dist/src/internal/cli/telemetry/error-classification/classifier.js +2 -1
  126. package/dist/src/internal/cli/telemetry/error-classification/classifier.js.map +1 -1
  127. package/dist/src/internal/using-hardhat2-plugin-errors.d.ts.map +1 -1
  128. package/dist/src/internal/using-hardhat2-plugin-errors.js +8 -11
  129. package/dist/src/internal/using-hardhat2-plugin-errors.js.map +1 -1
  130. package/dist/src/types/arguments.d.ts +1 -0
  131. package/dist/src/types/arguments.d.ts.map +1 -1
  132. package/dist/src/types/arguments.js +1 -0
  133. package/dist/src/types/arguments.js.map +1 -1
  134. package/dist/src/types/artifacts.d.ts +1 -0
  135. package/dist/src/types/artifacts.d.ts.map +1 -1
  136. package/dist/src/types/artifacts.js +1 -1
  137. package/dist/src/types/artifacts.js.map +1 -1
  138. package/dist/src/types/builtin-plugin-type-extensions.d.ts +2 -0
  139. package/dist/src/types/builtin-plugin-type-extensions.d.ts.map +1 -0
  140. package/dist/src/types/builtin-plugin-type-extensions.js +2 -0
  141. package/dist/src/types/builtin-plugin-type-extensions.js.map +1 -0
  142. package/dist/src/types/config.d.ts +1 -0
  143. package/dist/src/types/config.d.ts.map +1 -1
  144. package/dist/src/types/config.js +1 -1
  145. package/dist/src/types/config.js.map +1 -1
  146. package/dist/src/types/global-options.d.ts +1 -0
  147. package/dist/src/types/global-options.d.ts.map +1 -1
  148. package/dist/src/types/global-options.js +1 -1
  149. package/dist/src/types/global-options.js.map +1 -1
  150. package/dist/src/types/hooks.d.ts +1 -0
  151. package/dist/src/types/hooks.d.ts.map +1 -1
  152. package/dist/src/types/hooks.js +1 -1
  153. package/dist/src/types/hooks.js.map +1 -1
  154. package/dist/src/types/hre.d.ts +1 -0
  155. package/dist/src/types/hre.d.ts.map +1 -1
  156. package/dist/src/types/hre.js +1 -1
  157. package/dist/src/types/hre.js.map +1 -1
  158. package/dist/src/types/index.d.ts +1 -0
  159. package/dist/src/types/index.d.ts.map +1 -1
  160. package/dist/src/types/index.js +1 -0
  161. package/dist/src/types/index.js.map +1 -1
  162. package/dist/src/types/network.d.ts +1 -0
  163. package/dist/src/types/network.d.ts.map +1 -1
  164. package/dist/src/types/network.js +1 -1
  165. package/dist/src/types/network.js.map +1 -1
  166. package/dist/src/types/plugins.d.ts +1 -1
  167. package/dist/src/types/plugins.d.ts.map +1 -1
  168. package/dist/src/types/plugins.js +1 -1
  169. package/dist/src/types/plugins.js.map +1 -1
  170. package/dist/src/types/providers.d.ts +1 -0
  171. package/dist/src/types/providers.d.ts.map +1 -1
  172. package/dist/src/types/providers.js +1 -1
  173. package/dist/src/types/providers.js.map +1 -1
  174. package/dist/src/types/solidity.d.ts +1 -0
  175. package/dist/src/types/solidity.d.ts.map +1 -1
  176. package/dist/src/types/solidity.js +1 -0
  177. package/dist/src/types/solidity.js.map +1 -1
  178. package/dist/src/types/tasks.d.ts +1 -0
  179. package/dist/src/types/tasks.d.ts.map +1 -1
  180. package/dist/src/types/tasks.js +1 -0
  181. package/dist/src/types/tasks.js.map +1 -1
  182. package/dist/src/types/test.d.ts +1 -0
  183. package/dist/src/types/test.d.ts.map +1 -1
  184. package/dist/src/types/test.js +1 -1
  185. package/dist/src/types/test.js.map +1 -1
  186. package/dist/src/types/user-interruptions.d.ts +1 -0
  187. package/dist/src/types/user-interruptions.d.ts.map +1 -1
  188. package/dist/src/types/user-interruptions.js +1 -1
  189. package/dist/src/types/user-interruptions.js.map +1 -1
  190. package/package.json +12 -11
  191. package/src/config.ts +0 -2
  192. package/src/hre.ts +0 -3
  193. package/src/index.ts +0 -3
  194. package/src/internal/builtin-global-options.ts +2 -1
  195. package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts +90 -1
  196. package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts +24 -2
  197. package/src/internal/builtin-plugins/network-manager/config-resolution.ts +11 -3
  198. package/src/internal/builtin-plugins/network-manager/edr/edr-constants.ts +2 -0
  199. package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts +38 -8
  200. package/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts +43 -1
  201. package/src/internal/builtin-plugins/network-manager/network-manager.ts +5 -6
  202. package/src/internal/builtin-plugins/network-manager/type-extensions/config.ts +5 -3
  203. package/src/internal/builtin-plugins/network-manager/type-validation.ts +7 -1
  204. package/src/internal/builtin-plugins/network-manager/utils/apply-coverage-network-overrides.ts +32 -0
  205. package/src/internal/builtin-plugins/node/json-rpc/handler.ts +7 -5
  206. package/src/internal/builtin-plugins/solidity/build-system/build-system.ts +2 -15
  207. package/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.ts +1 -2
  208. package/src/internal/builtin-plugins/solidity/build-system/warning-suppression.ts +81 -59
  209. package/src/internal/builtin-plugins/solidity/constants.ts +11 -0
  210. package/src/internal/builtin-plugins/solidity/hook-handlers/hre.ts +2 -1
  211. package/src/internal/builtin-plugins/solidity/index.ts +1 -0
  212. package/src/internal/builtin-plugins/solidity/tasks/compile.ts +12 -0
  213. package/src/internal/builtin-plugins/solidity-test/config.ts +85 -12
  214. package/src/internal/builtin-plugins/solidity-test/eip712/ast-walker.ts +324 -0
  215. package/src/internal/builtin-plugins/solidity-test/eip712/canonicalize.ts +317 -0
  216. package/src/internal/builtin-plugins/solidity-test/eip712/glob.ts +225 -0
  217. package/src/internal/builtin-plugins/solidity-test/eip712/index.ts +120 -0
  218. package/src/internal/builtin-plugins/solidity-test/helpers.ts +28 -4
  219. package/src/internal/builtin-plugins/solidity-test/task-action.ts +12 -1
  220. package/src/internal/builtin-plugins/solidity-test/test-profiles.ts +1 -0
  221. package/src/internal/builtin-plugins/solidity-test/type-extensions.ts +100 -33
  222. package/src/internal/cli/error-handler.ts +103 -72
  223. package/src/internal/cli/init/init.ts +203 -16
  224. package/src/internal/cli/init/package-manager.ts +18 -1
  225. package/src/internal/cli/main.ts +65 -2
  226. package/src/internal/cli/telemetry/error-classification/classifier.ts +2 -1
  227. package/src/internal/using-hardhat2-plugin-errors.ts +8 -11
  228. package/src/types/arguments.ts +2 -0
  229. package/src/types/artifacts.ts +2 -0
  230. package/src/types/builtin-plugin-type-extensions.ts +15 -0
  231. package/src/types/config.ts +2 -0
  232. package/src/types/global-options.ts +2 -0
  233. package/src/types/hooks.ts +2 -0
  234. package/src/types/hre.ts +2 -0
  235. package/src/types/index.ts +2 -0
  236. package/src/types/network.ts +2 -0
  237. package/src/types/plugins.ts +1 -2
  238. package/src/types/providers.ts +2 -0
  239. package/src/types/solidity.ts +2 -0
  240. package/src/types/tasks.ts +2 -0
  241. package/src/types/test.ts +2 -0
  242. package/src/types/user-interruptions.ts +2 -0
  243. package/templates/hardhat-3/01-node-test-runner-viem/package.json +11 -11
  244. package/templates/hardhat-3/01-node-test-runner-viem/tsconfig.json +4 -7
  245. package/templates/hardhat-3/02-mocha-ethers/package.json +13 -13
  246. package/templates/hardhat-3/02-mocha-ethers/tsconfig.json +4 -7
  247. package/templates/hardhat-3/03-minimal/package.json +2 -2
  248. package/templates/hardhat-3/03-minimal/tsconfig.json +4 -7
@@ -1 +1 @@
1
- {"version":3,"file":"hre.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/hook-handlers/hre.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hre.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/hook-handlers/hre.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,mBAAmB,sBAAsB,CAAC;AAgC1C,QAAA,MAAM,aAAa,EAAE,aA6BpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,mBAAmB,sBAAsB,CAAC;AAgC1C,QAAA,MAAM,aAAa,EAAE,aA8BpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
@@ -47,6 +47,7 @@ const hardhatPlugin = {
47
47
  ...buildTask,
48
48
  id: ["compile"],
49
49
  description: "Build project (alias for build)",
50
+ action: async () => await import("./tasks/compile.js"),
50
51
  },
51
52
  ],
52
53
  globalOptions: [
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAI1D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC;KAC7C,OAAO,CAAC;IACP,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,iDAAiD;CAC/D,CAAC;KACD,OAAO,CAAC;IACP,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,2CAA2C;CACzD,CAAC;KACD,SAAS,CAAC;IACT,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,kCAAkC;IAC/C,YAAY,EAAE,SAAS;CACxB,CAAC;KACD,mBAAmB,CAAC;IACnB,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,sCAAsC;IACnD,YAAY,EAAE,EAAE;CACjB,CAAC;KACD,OAAO,CAAC;IACP,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,iCAAiC;CAC/C,CAAC;KACD,OAAO,CAAC;IACP,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,qCAAqC;CACnD,CAAC;KACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;KACvD,KAAK,EAAE,CAAC;AAEX,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,kBAAkB;IACtB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IACrD,YAAY,EAAE;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC;QACjD,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;QAC3C,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6BAA6B,CAAC;KACtD;IACD,KAAK,EAAE;QACL;YACE,GAAG,SAAS;YACZ,EAAE,EAAE,CAAC,OAAO,CAAC;YACb,WAAW,EAAE,eAAe;SAC7B;QACD;YACE,GAAG,SAAS;YACZ,EAAE,EAAE,CAAC,SAAS,CAAC;YACf,WAAW,EAAE,iCAAiC;SAC/C;KACF;IACD,aAAa,EAAE;QACb,YAAY,CAAC;YACX,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,0BAA0B;YACvC,IAAI,EAAE,YAAY,CAAC,sBAAsB;YACzC,YAAY,EAAE,SAAS;SACxB,CAAC;KACH;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAI1D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC;KAC7C,OAAO,CAAC;IACP,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,iDAAiD;CAC/D,CAAC;KACD,OAAO,CAAC;IACP,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,2CAA2C;CACzD,CAAC;KACD,SAAS,CAAC;IACT,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,kCAAkC;IAC/C,YAAY,EAAE,SAAS;CACxB,CAAC;KACD,mBAAmB,CAAC;IACnB,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,sCAAsC;IACnD,YAAY,EAAE,EAAE;CACjB,CAAC;KACD,OAAO,CAAC;IACP,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,iCAAiC;CAC/C,CAAC;KACD,OAAO,CAAC;IACP,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,qCAAqC;CACnD,CAAC;KACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;KACvD,KAAK,EAAE,CAAC;AAEX,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,kBAAkB;IACtB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IACrD,YAAY,EAAE;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC;QACjD,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;QAC3C,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6BAA6B,CAAC;KACtD;IACD,KAAK,EAAE;QACL;YACE,GAAG,SAAS;YACZ,EAAE,EAAE,CAAC,OAAO,CAAC;YACb,WAAW,EAAE,eAAe;SAC7B;QACD;YACE,GAAG,SAAS;YACZ,EAAE,EAAE,CAAC,SAAS,CAAC;YACf,WAAW,EAAE,iCAAiC;YAC9C,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC;SACvD;KACF;IACD,aAAa,EAAE;QACb,YAAY,CAAC;YACX,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,0BAA0B;YACvC,IAAI,EAAE,YAAY,CAAC,sBAAsB;YACzC,YAAY,EAAE,SAAS;SACxB,CAAC;KACH;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}
@@ -0,0 +1,9 @@
1
+ import type { NewTaskActionFunction } from "../../../../types/tasks.js";
2
+ /**
3
+ * Compile task action is an alias of the build task action, it invokes
4
+ * the build task to ensure any build overrides are properly executed when
5
+ * compile is run.
6
+ */
7
+ declare const compileAction: NewTaskActionFunction;
8
+ export default compileAction;
9
+ //# sourceMappingURL=compile.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/tasks/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE;;;;GAIG;AACH,QAAA,MAAM,aAAa,EAAE,qBAEpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
@@ -0,0 +1,10 @@
1
+ /**
2
+ * Compile task action is an alias of the build task action, it invokes
3
+ * the build task to ensure any build overrides are properly executed when
4
+ * compile is run.
5
+ */
6
+ const compileAction = async (args, hre) => {
7
+ return await hre.tasks.getTask("build").run(args);
8
+ };
9
+ export default compileAction;
10
+ //# sourceMappingURL=compile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/tasks/compile.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,aAAa,GAA0B,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IAC/D,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
@@ -1,10 +1,11 @@
1
1
  import type { HardhatUserConfig } from "../../../config.js";
2
2
  import type { ConfigurationVariableResolver, HardhatConfig } from "../../../types/config.js";
3
3
  import type { HardhatUserConfigValidationError } from "../../../types/hooks.js";
4
- import type { SolidityTestConfig, SolidityTestForkingConfig, SolidityTestUserConfig } from "../../../types/test.js";
4
+ import type { SolidityTestForkingConfig, SolidityTestProfileConfig, SolidityTestProfileUserConfig } from "../../../types/test.js";
5
5
  export declare const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
6
- export declare function resolveSolidityTestForkingConfig(forkingUserConfig: SolidityTestUserConfig["forking"], resolveConfigurationVariable: ConfigurationVariableResolver): SolidityTestForkingConfig | undefined;
6
+ export declare function resolveSolidityTestForkingConfig(forkingUserConfig: SolidityTestProfileUserConfig["forking"], resolveConfigurationVariable: ConfigurationVariableResolver): SolidityTestForkingConfig | undefined;
7
7
  export declare function validateSolidityTestUserConfig(userConfig: unknown): HardhatUserConfigValidationError[];
8
8
  export declare function resolveSolidityTestUserConfig(userConfig: HardhatUserConfig, resolvedConfig: HardhatConfig, resolveConfigurationVariable: ConfigurationVariableResolver): Promise<HardhatConfig>;
9
- export declare function resolveFuzzConfig(fuzzUserConfig?: SolidityTestUserConfig["fuzz"]): SolidityTestConfig["fuzz"];
9
+ export declare function resolveFuzzConfig(fuzzUserConfig?: SolidityTestProfileUserConfig["fuzz"]): SolidityTestProfileConfig["fuzz"];
10
+ export declare function resolveEip712TypesConfig(eip712TypesUserConfig?: SolidityTestProfileUserConfig["eip712Types"]): SolidityTestProfileConfig["eip712Types"];
10
11
  //# sourceMappingURL=config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EACV,6BAA6B,EAC7B,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACV,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"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EACV,6BAA6B,EAC7B,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACV,yBAAyB,EACzB,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"}
@@ -1,11 +1,13 @@
1
1
  import path from "node:path";
2
+ import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
2
3
  import { isObject } from "@nomicfoundation/hardhat-utils/lang";
3
4
  import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
4
- import { conditionalUnionType, sensitiveStringSchema, sensitiveUrlSchema, unionType, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
5
+ import { conditionalUnionType, incompatibleFieldType, sensitiveStringSchema, sensitiveUrlSchema, unionType, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
5
6
  import { z } from "zod";
7
+ import { DEFAULT_TEST_PROFILE } from "./test-profiles.js";
6
8
  // the keccak256 of "built for ethereum"
7
9
  export const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
8
- const solidityTestUserConfigType = z.object({
10
+ const solidityTestProfileUserConfigType = z.object({
9
11
  fsPermissions: z
10
12
  .object({
11
13
  readWriteFile: z.array(z.string()).optional(),
@@ -27,7 +29,11 @@ const solidityTestUserConfigType = z.object({
27
29
  blockTimestamp: z.bigint().optional(),
28
30
  prevRandao: z.bigint().optional(),
29
31
  gasLimit: z.bigint().optional(),
30
- blockGasLimit: z.bigint().or(z.literal(false)).optional(),
32
+ blockGasLimit: z.number().or(z.bigint()).or(z.literal(false)).optional(),
33
+ // TODO: widen back to .number().or(z.bigint()).or(z.literal(false))
34
+ // once Solidity test runner no longer breaks setUp() when
35
+ // disableTransactionGasCap is false. See PR #8301.
36
+ transactionGasCap: z.literal(false).optional(),
31
37
  fuzz: z
32
38
  .object({
33
39
  failurePersistDir: z.string().optional(),
@@ -61,7 +67,30 @@ const solidityTestUserConfigType = z.object({
61
67
  shrinkRunLimit: z.number().optional(),
62
68
  })
63
69
  .optional(),
70
+ eip712Types: z
71
+ .object({
72
+ include: z.array(z.string()).optional(),
73
+ exclude: z.array(z.string()).optional(),
74
+ })
75
+ .optional(),
64
76
  });
77
+ const solidityTestFlatUserConfigType = solidityTestProfileUserConfigType.extend({
78
+ profiles: incompatibleFieldType("This field is incompatible with the flat solidity test config"),
79
+ });
80
+ const solidityTestProfilesUserConfigType = z.object({
81
+ profiles: z
82
+ .record(z.string(), solidityTestProfileUserConfigType)
83
+ .refine((profiles) => DEFAULT_TEST_PROFILE in profiles, "A `default` profile is required when using `profiles`")
84
+ .refine((profiles) => !(DEFAULT_TEST_PROFILE in profiles) ||
85
+ 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."),
86
+ });
87
+ const solidityTestUserConfigType = conditionalUnionType([
88
+ [
89
+ (data) => isObject(data) && "profiles" in data && Object.keys(data).length === 1,
90
+ solidityTestProfilesUserConfigType,
91
+ ],
92
+ [isObject, solidityTestFlatUserConfigType],
93
+ ], "Expected a Solidity test config or a `{ profiles: { ... } }` wrapper");
65
94
  const userConfigType = z.object({
66
95
  paths: z
67
96
  .object({
@@ -107,12 +136,22 @@ export async function resolveSolidityTestUserConfig(userConfig, resolvedConfig,
107
136
  testsPath = typeof testsPath === "object" ? testsPath.solidity : testsPath;
108
137
  testsPath ??= "test";
109
138
  const defaultRpcCachePath = path.join(resolvedConfig.paths.cache, "edr");
110
- const resolvedForking = resolveSolidityTestForkingConfig(userConfig.test?.solidity?.forking, resolveConfigurationVariable);
111
- const solidityTest = {
139
+ const solidityUserConfig = userConfig.test?.solidity;
140
+ let profileUserConfig;
141
+ if (solidityUserConfig !== undefined && "profiles" in solidityUserConfig) {
142
+ profileUserConfig = solidityUserConfig.profiles[DEFAULT_TEST_PROFILE];
143
+ assertHardhatInvariant(profileUserConfig !== undefined, "default profile must be present when the profiles wrapper user config is supplied");
144
+ }
145
+ else {
146
+ profileUserConfig = solidityUserConfig;
147
+ }
148
+ const resolvedForking = resolveSolidityTestForkingConfig(profileUserConfig?.forking, resolveConfigurationVariable);
149
+ const resolvedDefaultProfile = {
112
150
  rpcCachePath: defaultRpcCachePath,
113
- ...userConfig.test?.solidity,
114
- fuzz: resolveFuzzConfig(userConfig.test?.solidity?.fuzz),
151
+ ...profileUserConfig,
152
+ fuzz: resolveFuzzConfig(profileUserConfig?.fuzz),
115
153
  forking: resolvedForking,
154
+ eip712Types: resolveEip712TypesConfig(profileUserConfig?.eip712Types),
116
155
  };
117
156
  return {
118
157
  ...resolvedConfig,
@@ -125,7 +164,9 @@ export async function resolveSolidityTestUserConfig(userConfig, resolvedConfig,
125
164
  },
126
165
  test: {
127
166
  ...resolvedConfig.test,
128
- solidity: solidityTest,
167
+ solidity: {
168
+ profiles: { [DEFAULT_TEST_PROFILE]: resolvedDefaultProfile },
169
+ },
129
170
  },
130
171
  };
131
172
  }
@@ -135,4 +176,10 @@ export function resolveFuzzConfig(fuzzUserConfig = {}) {
135
176
  seed: fuzzUserConfig.seed ?? DEFAULT_FUZZ_SEED,
136
177
  };
137
178
  }
179
+ export function resolveEip712TypesConfig(eip712TypesUserConfig = {}) {
180
+ return {
181
+ include: eip712TypesUserConfig.include ?? [],
182
+ exclude: eip712TypesUserConfig.exclude ?? [],
183
+ };
184
+ }
138
185
  //# sourceMappingURL=config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,58 @@
1
+ /**
2
+ * A single field of a Solidity struct
3
+ */
4
+ export interface StructMember {
5
+ name: string;
6
+ /**
7
+ * EIP-712 type string, or `undefined` if the type can't be encoded (e.g. mappings).
8
+ */
9
+ type: string | undefined;
10
+ }
11
+ /**
12
+ * A Solidity struct extracted from a source AST (Abstract Syntax Tree).
13
+ */
14
+ export interface CollectedStruct {
15
+ name: string;
16
+ members: StructMember[];
17
+ /**
18
+ * Project-relative source path. Used for diagnostics only.
19
+ */
20
+ sourcePath: string;
21
+ }
22
+ /**
23
+ * A user-defined value type (`type Foo is bytes32;`) resolves to its
24
+ * underlying elementary type for EIP-712 encoding.
25
+ * The map is keyed by the user-defined value type definition's solc node id,
26
+ * which is what `referencedDeclaration` on a `UserDefinedTypeName` reference
27
+ * points to.
28
+ */
29
+ export type UserDefinedValueTypeIndex = Map<number, Record<string, unknown>>;
30
+ /**
31
+ * Walks every AST in the build and indexes every `UserDefinedValueTypeDefinition`
32
+ * by its node `id`, mapping to its `underlyingType` (an `ElementaryTypeName`).
33
+ *
34
+ * User-defined value types can sit at file scope or inside a contract, and a
35
+ * struct in one source may reference a user-defined value type defined in
36
+ * another, so this must run across every AST in the build — not just the ones
37
+ * matched by the user's include globs.
38
+ */
39
+ export declare function buildUserDefinedValueTypeIndex(asts: unknown[]): UserDefinedValueTypeIndex;
40
+ /**
41
+ * Returns every struct definition reachable from a solc source AST (Abstract Syntax Tree),
42
+ * including structs nested inside contracts.
43
+ */
44
+ export declare function extractStructsFromAst(ast: unknown, sourcePath: string, userDefinedValueTypeI?: UserDefinedValueTypeIndex): CollectedStruct[];
45
+ /**
46
+ * Converts a solc `typeName` AST node into its EIP-712 type string, following
47
+ * the same conventions as `forge bind-json`:
48
+ *
49
+ * - elementary types pass through (`address`, `uint256`, `string`, ...)
50
+ * - enums → `uint8`
51
+ * - contracts / interfaces → `address`
52
+ * - structs → bare name (`Wallet.Person` → `Person`)
53
+ * - user-defined value types → underlying elementary type (`type Foo is bytes32` → `bytes32`)
54
+ * - arrays → `T[]` (dynamic) or `T[N]` (fixed)
55
+ * - mappings / functions → `undefined` (not EIP-712 encodable)
56
+ */
57
+ export declare function encodeMemberType(typeName: unknown, userDefinedValueTypeI?: UserDefinedValueTypeIndex): string | undefined;
58
+ //# sourceMappingURL=ast-walker.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -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"}