Update for Hardhat 3

.lintstagedrc.json

@@ -1,3 +1,3 @@
 {
-  "*.{js,ts,ejs,sol,json,md}": ["prettier --write"]
+  "*.{js,ts,sol,json,md}": ["prettier --write"]
 }

.prettierrc.json

@@ -4,7 +4,6 @@
   "trailingComma": "all",
   "bracketSpacing": true,
   "plugins": [
-    "prettier-plugin-ejs",
     "prettier-plugin-solidity",
     "@trivago/prettier-plugin-sort-imports"
   ]

README.md

@@ -17,7 +17,16 @@ yarn add --dev @solidstate/hardhat-storage-layout-diff
 Load plugin in Hardhat config:
 
 ```javascript
-require('@solidstate/hardhat-storage-layout-diff');
+import HardhatStorageLayoutDiff from '@solidstate/hardhat-storage-layout-diff';
+
+const config: HardhatUserConfig = {
+  plugins: [
+    HardhatStorageLayoutDiff,
+  ],
+  storageLayoutDiff: {
+    ... // see table for configuration options
+  },
+};
 ```
 
 Add configuration under the `storageLayoutDiff` key:
@@ -39,24 +48,26 @@ npx hardhat export-storage-layout
 yarn run hardhat export-storage-layout
 ```
 
-Compare two contracts:
+Inspect a contract's storage layout:
 
 ```bash
-npx hardhat diff-storage-layout [CONTRACT_A_FULLY_QUALIFIED_NAME] [CONTRACT_B_FULLY_QUALIFIED_NAME]
+npx hardhat inspect-storage-layout [CONTRACT_IDENTIFIER]
 # or
-yarn run hardhat diff-storage-layout [CONTRACT_A_FULLY_QUALIFIED_NAME] [CONTRACT_B_FULLY_QUALIFIED_NAME]
+yarn run hardhat inspect-storage-layout [CONTRACT_IDENTIFIER]
 ```
 
-Include the optional `--a-ref` and/or `--b-ref` arguments to specify the git reference where contracts `a` and `b` are defined, respectively.
-
-Compare a contract to an exported JSON layout:
+Compare two contracts:
 
 ```bash
-npx hardhat storage-layout-check --source [PATH_TO_LAYOUT_JSON] --b [CONTRACT_B_FULLY_QUALIFIED_NAME]
+npx hardhat diff-storage-layout [CONTRACT_A_IDENTIFIER] [CONTRACT_B_IDENTIFIER]
 # or
-yarn run hardhat storage-layout-check --source [PATH_TO_LAYOUT_JSON] --b [CONTRACT_B_FULLY_QUALIFIED_NAME]
+yarn run hardhat diff-storage-layout [CONTRACT_A_IDENTIFIER] [CONTRACT_B_IDENTIFIER]
 ```
 
+A contract identifier may be a name, a fully qualified name, or a path to a JSON file containing a storage layout.
+
+Include the optional git ref options to look up a contract identifier at a particular git reference.
+
 ## Development
 
 Install dependencies via Yarn:

contracts/Test.sol

@@ -10,7 +10,7 @@ contract Test {
     struct Struct {
         address a;
         E e;
-        address b;
+        address b_changed;
         E f;
     }
 

hardhat.config.ts

@@ -1,8 +1,9 @@
-import './src/index';
+import HardhatStorageLayoutDiff from './src/index.js';
 import { HardhatUserConfig } from 'hardhat/config';
 
 const config: HardhatUserConfig = {
   solidity: '0.8.28',
+  plugins: [HardhatStorageLayoutDiff],
 };
 
 export default config;

package.json

@@ -16,10 +16,13 @@
   ],
   "repository": "github:solidstate-network/hardhat-storage-layout-diff",
   "author": "Nick Barry",
+  "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "scripts": {
-    "build": "tsc --build --clean",
+    "build": "yarn clean && tsc --build",
+    "clean": "tsc --build --clean",
+    "postinstall": "patch-package",
     "prepare": "husky",
     "prettier": "prettier --write ."
   },
@@ -28,18 +31,16 @@
     "src"
   ],
   "peerDependencies": {
-    "hardhat": "^2.0.0"
+    "hardhat": "3.0.0-next.4"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "@types/ejs": "^3.1.5",
-    "@types/mocha": "^10.0.10",
     "@types/node": "^22.14.1",
-    "hardhat": "^2.23.0",
+    "hardhat": "3.0.0-next.4",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.1",
+    "patch-package": "^8.0.0",
     "prettier": "^3.5.3",
-    "prettier-plugin-ejs": "^1.0.3",
     "prettier-plugin-solidity": "^1.4.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"

patches/hardhat+3.0.0-next.4.patch

@@ -0,0 +1,28 @@
+diff --git a/node_modules/hardhat/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.js b/node_modules/hardhat/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.js
+index c250a14..640899a 100644
+--- a/node_modules/hardhat/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.js
++++ b/node_modules/hardhat/dist/src/internal/builtin-plugins/solidity/build-system/compilation-job.js
+@@ -77,6 +77,23 @@ export class CompilationJobImplementation {
+         };
+         // TODO: Deep merge the user output selection with the default one
+         const outputSelection = defaultOutputSelection;
++
++        const configOutputSelection = settings.outputSelection ?? {};
++
++        for (const fileKey in configOutputSelection) {
++            const configFileOutputSelection = configOutputSelection[fileKey] ?? {};
++            outputSelection[fileKey] ??= {};
++            for (const contractKey in configFileOutputSelection) {
++                const configContractOutputSelection = configFileOutputSelection[contractKey] ?? [];
++                outputSelection[fileKey][contractKey] ??= [];
++
++                const values = Array.from(new Set([...outputSelection[fileKey][contractKey], ...configContractOutputSelection]))
++                values.sort();
++
++                outputSelection[fileKey][contractKey] = values;
++            }
++        }
++
+         return {
+             language: "Solidity",
+             settings: {

src/actions/diff_storage_layout.ts

@@ -0,0 +1,35 @@
+import {
+  collateStorageLayout,
+  loadRawStorageLayout,
+  mergeCollatedSlots,
+  printMergedCollatedSlots,
+} from '../lib/storage_layout_diff.js';
+import { NewTaskActionFunction } from 'hardhat/types/tasks';
+
+interface DiffStorageLayoutTaskActionArguments {
+  a: string;
+  b: string;
+  aRef: string;
+  bRef: string;
+}
+
+const action: NewTaskActionFunction<
+  DiffStorageLayoutTaskActionArguments
+> = async (args, hre) => {
+  // TODO: import task name constant
+  await hre.tasks.getTask('compile').run();
+
+  // TODO: check default values of ref parameters
+  const slotsA = collateStorageLayout(
+    await loadRawStorageLayout(hre, args.a, args.aRef),
+  );
+  const slotsB = collateStorageLayout(
+    await loadRawStorageLayout(hre, args.b, args.bRef),
+  );
+
+  const mergedSlots = mergeCollatedSlots(slotsA, slotsB);
+
+  printMergedCollatedSlots(mergedSlots);
+};
+
+export default action;

src/actions/export_storage_layout.ts.ts

@@ -0,0 +1,63 @@
+import pkg from '../../package.json';
+import { loadRawStorageLayout } from '../lib/storage_layout_diff.js';
+import { HardhatPluginError } from 'hardhat/plugins';
+import { NewTaskActionFunction } from 'hardhat/types/tasks';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const action: NewTaskActionFunction = async (args, hre) => {
+  // TODO: import task name constant
+  await hre.tasks.getTask('compile').run();
+
+  const config = hre.config.storageLayoutDiff;
+
+  const outputDirectory = path.resolve(hre.config.paths.root, config.path);
+
+  if (!outputDirectory.startsWith(hre.config.paths.root)) {
+    throw new HardhatPluginError(
+      pkg.name,
+      'resolved path must be inside of project directory',
+    );
+  }
+
+  if (outputDirectory === hre.config.paths.root) {
+    throw new HardhatPluginError(
+      pkg.name,
+      'resolved path must not be root directory',
+    );
+  }
+
+  if (config.clear && fs.existsSync(outputDirectory)) {
+    fs.rmdirSync(outputDirectory, { recursive: true });
+  }
+
+  if (!fs.existsSync(outputDirectory)) {
+    fs.mkdirSync(outputDirectory, { recursive: true });
+  }
+
+  for (let fullName of await hre.artifacts.getAllFullyQualifiedNames()) {
+    if (config.only.length && !config.only.some((m) => fullName.match(m)))
+      continue;
+    if (config.except.length && config.except.some((m) => fullName.match(m)))
+      continue;
+
+    const storageLayout = await loadRawStorageLayout(hre, fullName);
+    const { storage, types } = storageLayout;
+
+    if (!storage.length) continue;
+
+    const destination =
+      path.resolve(outputDirectory, config.flat ? '' : '', fullName) + '.json';
+
+    if (!fs.existsSync(path.dirname(destination))) {
+      fs.mkdirSync(path.dirname(destination), { recursive: true });
+    }
+
+    fs.writeFileSync(
+      destination,
+      `${JSON.stringify({ storage, types }, null, config.spacing)}\n`,
+    );
+  }
+};
+
+export default action;

src/actions/inspect_storage_layout.ts

@@ -0,0 +1,26 @@
+import {
+  collateStorageLayout,
+  loadRawStorageLayout,
+  printCollatedSlots,
+} from '../lib/storage_layout_diff.js';
+import { NewTaskActionFunction } from 'hardhat/types/tasks';
+
+interface InspectStorageLayoutTaskActionArguments {
+  contract: string;
+  ref: string;
+}
+
+const action: NewTaskActionFunction<
+  InspectStorageLayoutTaskActionArguments
+> = async (args, hre) => {
+  // TODO: import task name constant
+  await hre.tasks.getTask('compile').run();
+
+  const slots = collateStorageLayout(
+    await loadRawStorageLayout(hre, args.contract, args.ref),
+  );
+
+  printCollatedSlots(slots);
+};
+
+export default action;

src/hooks/config.ts

@@ -0,0 +1,40 @@
+import type { StorageLayoutDiffConfig } from '../types.js';
+import type { ConfigHooks } from 'hardhat/types/hooks';
+
+const DEFAULT_CONFIG: StorageLayoutDiffConfig = {
+  path: './storage_layout',
+  clear: false,
+  flat: false,
+  only: [],
+  except: [],
+  spacing: 2,
+};
+
+export default async (): Promise<Partial<ConfigHooks>> => ({
+  resolveUserConfig: async (userConfig, resolveConfigurationVariable, next) => {
+    const result = {
+      ...(await next(userConfig, resolveConfigurationVariable)),
+      storageLayoutDiff: {
+        ...DEFAULT_CONFIG,
+        ...userConfig.storageLayoutDiff,
+      },
+    };
+
+    for (const key in result.solidity.profiles) {
+      const profile = result.solidity.profiles[key];
+
+      for (const compiler of profile.compilers) {
+        const settings = compiler.settings;
+        settings.outputSelection ??= {};
+        settings.outputSelection['*'] ??= {};
+        settings.outputSelection['*']['*'] ??= [];
+
+        if (!settings.outputSelection['*']['*'].includes('storageLayout')) {
+          settings.outputSelection['*']['*'].push('storageLayout');
+        }
+      }
+    }
+
+    return result;
+  },
+});

src/index.ts

@@ -1,34 +1,21 @@
-import './tasks/diff_storage_layout';
-import './tasks/export_storage_layout';
-import './tasks/inspect_storage_layout';
-import './tasks/storage_layout_check';
+import pkg from '../package.json';
+import taskDiffStorageLayout from './tasks/diff_storage_layout.js';
+import taskExportStorageLayout from './tasks/export_storage_layout.js';
+import taskInspectStorageLayout from './tasks/inspect_storage_layout.js';
 import './type_extensions';
-import type { StorageLayoutDiffConfig } from './types';
-import { extendConfig } from 'hardhat/config';
+import type { HardhatPlugin } from 'hardhat/types/plugins';
 
-// TODO: types may be incomplete
-
-const DEFAULT_CONFIG: StorageLayoutDiffConfig = {
-  path: './storage_layout',
-  clear: false,
-  flat: false,
-  only: [],
-  except: [],
-  spacing: 2,
+const plugin: HardhatPlugin = {
+  id: pkg.name,
+  npmPackage: pkg.name,
+  tasks: [
+    taskDiffStorageLayout,
+    taskExportStorageLayout,
+    taskInspectStorageLayout,
+  ],
+  hookHandlers: {
+    config: import.meta.resolve('./hooks/config.js'),
+  },
 };
 
-extendConfig(function (config, userConfig) {
-  config.storageLayoutDiff = Object.assign(
-    {},
-    DEFAULT_CONFIG,
-    userConfig.storageLayoutDiff,
-  );
-
-  for (const compiler of config.solidity.compilers) {
-    const outputSelection = compiler.settings.outputSelection['*']['*'];
-
-    if (!outputSelection.includes('storageLayout')) {
-      outputSelection.push('storageLayout');
-    }
-  }
-});
+export default plugin;