Merge branch 'master' into typo-fixes

Author: arr00

.github/actions/setup/action.yml

@@ -6,7 +6,7 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
     - uses: actions/cache@v4
       id: cache
       with:

contracts/account/extensions/draft-AccountERC7579.sol

@@ -4,7 +4,16 @@ pragma solidity ^0.8.26;
 
 import {PackedUserOperation} from "../../interfaces/draft-IERC4337.sol";
 import {IERC1271} from "../../interfaces/IERC1271.sol";
-import {IERC7579Module, IERC7579Validator, IERC7579Execution, IERC7579AccountConfig, IERC7579ModuleConfig, MODULE_TYPE_VALIDATOR, MODULE_TYPE_EXECUTOR, MODULE_TYPE_FALLBACK} from "../../interfaces/draft-IERC7579.sol";
+import {
+    IERC7579Module,
+    IERC7579Validator,
+    IERC7579Execution,
+    IERC7579AccountConfig,
+    IERC7579ModuleConfig,
+    MODULE_TYPE_VALIDATOR,
+    MODULE_TYPE_EXECUTOR,
+    MODULE_TYPE_FALLBACK
+} from "../../interfaces/draft-IERC7579.sol";
 import {ERC7579Utils, Mode, CallType, ExecType} from "../../account/utils/draft-ERC7579Utils.sol";
 import {EnumerableSet} from "../../utils/structs/EnumerableSet.sol";
 import {Bytes} from "../../utils/Bytes.sol";

contracts/mocks/account/modules/ERC7579Mock.sol

@@ -2,7 +2,14 @@
 
 pragma solidity ^0.8.24;
 
-import {MODULE_TYPE_HOOK, MODULE_TYPE_FALLBACK, MODULE_TYPE_VALIDATOR, IERC7579Hook, IERC7579Module, IERC7579Validator} from "../../../interfaces/draft-IERC7579.sol";
+import {
+    MODULE_TYPE_HOOK,
+    MODULE_TYPE_FALLBACK,
+    MODULE_TYPE_VALIDATOR,
+    IERC7579Hook,
+    IERC7579Module,
+    IERC7579Validator
+} from "../../../interfaces/draft-IERC7579.sol";
 import {SignatureChecker} from "../../../utils/cryptography/SignatureChecker.sol";
 import {PackedUserOperation} from "../../../interfaces/draft-IERC4337.sol";
 import {IERC1271} from "../../../interfaces/IERC1271.sol";

package-lock.json

@@ -80,7 +80,7 @@
     "micromatch": "^4.0.2",
     "p-limit": "^6.0.0",
     "prettier": "^3.0.0",
-    "prettier-plugin-solidity": "^1.1.0",
+    "prettier-plugin-solidity": "^2.0.0",
     "rimraf": "^6.0.0",
     "semver": "^7.3.5",
     "solhint": "^5.0.0",
@@ -89,7 +89,7 @@
     "solidity-coverage": "^0.8.14",
     "solidity-docgen": "^0.6.0-beta.29",
     "undici": "^7.4.0",
-    "yargs": "^17.0.0"
+    "yargs": "^18.0.0"
   },
   "lint-staged": {
     "*.{js,ts}": [

package.json

@@ -1,10 +1,18 @@
+#!/usr/bin/env node
+
 const fs = require('fs');
 const { getStorageUpgradeReport } = require('@openzeppelin/upgrades-core/dist/storage');
 
-const { ref, head } = require('yargs').argv;
+const { hideBin } = require('yargs/helpers');
+const { argv } = require('yargs/yargs')(hideBin(process.argv))
+  .env('')
+  .options({
+    ref: { type: 'string', required: true },
+    head: { type: 'string', required: true },
+  });
 
-const oldLayout = JSON.parse(fs.readFileSync(ref));
-const newLayout = JSON.parse(fs.readFileSync(head));
+const oldLayout = JSON.parse(fs.readFileSync(argv.ref));
+const newLayout = JSON.parse(fs.readFileSync(argv.head));
 
 for (const name in oldLayout) {
   if (name in newLayout) {

scripts/checks/compare-layout.js

@@ -2,8 +2,10 @@
 
 const fs = require('fs');
 const chalk = require('chalk');
-const { argv } = require('yargs')
-  .env()
+
+const { hideBin } = require('yargs/helpers');
+const { argv } = require('yargs/yargs')(hideBin(process.argv))
+  .env('')
   .options({
     style: {
       type: 'string',

scripts/checks/compareGasReports.js

@@ -2,7 +2,8 @@ const fs = require('fs');
 const { findAll, astDereferencer, srcDecoder } = require('solidity-ast/utils');
 const { extractStorageLayout } = require('@openzeppelin/upgrades-core/dist/storage/extract');
 
-const { _ } = require('yargs').argv;
+const { hideBin } = require('yargs/helpers');
+const { argv } = require('yargs/yargs')(hideBin(process.argv));
 
 const skipPath = ['contracts/mocks/', 'contracts-exposed/'];
 const skipKind = ['interface', 'library'];
@@ -35,4 +36,4 @@ function extractLayouts(path) {
   return layout;
 }
 
-console.log(JSON.stringify(Object.assign(..._.map(extractLayouts))));
+console.log(JSON.stringify(Object.assign(...argv._.map(extractLayouts))));

scripts/checks/extract-layout.js

@@ -4,7 +4,7 @@ const path = require('path');
 const graphlib = require('graphlib');
 const match = require('micromatch');
 const { findAll } = require('solidity-ast/utils');
-const { _: artifacts } = require('yargs').argv;
+const { _: artifacts } = require('yargs/yargs')().argv;
 
 // files to skip
 const skipPatterns = ['contracts-exposed/**', 'contracts/mocks/**'];