Yarn + solhint

.gitignore

@@ -9,3 +9,11 @@ broadcast/
 cache/
 out/
 lcov.info
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarn/patches/solhint-npm-4.5.2-10dbd0e73b.patch

@@ -0,0 +1,39 @@
+diff --git a/solhint.js b/solhint.js
+index 755a910c9c084d027520a73b7b989b9b7912a975..53d912394404ee6bc0a4f283da9ee145f1f73d76 100755
+--- a/solhint.js
++++ b/solhint.js
+@@ -160,8 +160,7 @@ function executeMainActionLogic() {
+
+   printReports(reports, formatterFn)
+
+-  // exitWithCode(reports)
+-  process.exit(0)
++  exitWithCode(reports)
+ }
+
+ function processStdin(options) {
+@@ -182,8 +181,7 @@ function processStdin(options) {
+   const reports = [report]
+
+   printReports(reports, formatterFn)
+-  process.exit(0)
+-  // exitWithCode(reports)
++  exitWithCode(reports)
+ }
+
+ function writeSampleConfigFile() {
+@@ -363,10 +361,10 @@ function listRules() {
+   }
+ }
+
+-// function exitWithCode(reports) {
+-//   const errorsCount = reports.reduce((acc, i) => acc + i.errorCount, 0)
+-//   process.exit(errorsCount > 0 ? 1 : 0)
+-// }
++function exitWithCode(reports) {
++  const errorsCount = reports.reduce((acc, i) => acc + i.errorCount, 0)
++  process.exit(errorsCount > 0 ? 1 : 0)
++}
+
+ function checkForUpdate() {
+   // eslint-disable-next-line import/no-extraneous-dependencies

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.1.1.cjs

package.json

@@ -21,11 +21,15 @@
     "lint-staged": "^14.0.1",
     "prettier": "^3.0.3",
     "prettier-plugin-solidity": "^1.1.3",
-    "solhint": "^4.5.2",
+    "solhint": "patch:solhint@npm%3A4.5.2#~/.yarn/patches/solhint-npm-4.5.2-10dbd0e73b.patch",
     "solhint-plugin-lido-csm": "https://github.com/lidofinance/solhint-plugin-lido-csm.git#0.3.2"
   },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write",
     "src/**/*.sol": "solhint"
+  },
+  "packageManager": "yarn@4.1.1",
+  "resolutions": {
+    "solhint@npm:4.5.2": "patch:solhint@npm%3A4.5.2#~/.yarn/patches/solhint-npm-4.5.2-10dbd0e73b.patch"
   }
 }

src/CSAccounting.sol

@@ -622,11 +622,6 @@ contract CSAccounting is
         AssetRecovererLib.recoverStETHShares(address(LIDO), shares);
     }
 
-    modifier onlyRecoverer() override {
-        _checkRole(RECOVERER_ROLE);
-        _;
-    }
-
     function _getActiveKeys(
         uint256 nodeOperatorId
     ) internal view returns (uint256) {
@@ -660,4 +655,9 @@ contract CSAccounting is
         }
         _;
     }
+
+    modifier onlyRecoverer() override {
+        _checkRole(RECOVERER_ROLE);
+        _;
+    }
 }

src/CSModule.sol

@@ -127,7 +127,7 @@
     error MaxSigningKeysCountExceeded();
 }
 
 contract CSModule is
     ICSModule,
     CSModuleBase,
     AccessControl,
@@ -1093,7 +1093,7 @@
     function onExitedAndStuckValidatorsCountsUpdated()
         external
         onlyRole(STAKING_ROUTER_ROLE)
     {
         // Nothing to do, rewards are distributed by a performance oracle.
     }
 
@@ -1675,11 +1675,6 @@
         );
     }
 
-    modifier onlyRecoverer() override {
-        _checkRole(RECOVERER_ROLE);
-        _;
-    }
-
     function _incrementModuleNonce() internal {
         _nonce++;
     }
@@ -1725,4 +1720,9 @@
             revert NodeOperatorDoesNotExist();
         _;
     }
+
+    modifier onlyRecoverer() override {
+        _checkRole(RECOVERER_ROLE);
+        _;
+    }
 }