chore: solhint lint

Author: Filipp Makarov

.husky/pre-commit

@@ -17,17 +17,23 @@ for file in $STAGED_FILES; do
   fi
 done
 
-# Run Solhint and only output Errors, not warnings via awk
-ERROR_OUTPUT=$(./node_modules/.bin/solhint 'contracts/**/*.sol' 2>&1 | awk '
+# Run Solhint to a temp file (pipes/subshells truncate large output)
+SOLHINT_TMP=$(mktemp)
+./node_modules/.bin/solhint 'contracts/**/*.sol' > "$SOLHINT_TMP" 2>&1 || true
+
+# Extract only error lines (not warnings) with their file context
+ERROR_OUTPUT=$(awk '
 /\.sol$/ { current_file = $0 }
-/error/ && !/problems.*error/ {
+/  error  / && !/problems.*error/ {
     if (current_file && !file_printed[current_file]) {
         print current_file
         file_printed[current_file] = 1
     }
     print $0
 }
-')
+' "$SOLHINT_TMP")
+
+rm -f "$SOLHINT_TMP"
 
 # If there are error lines, show them and exit
 if [ -n "$ERROR_OUTPUT" ]; then

.solhintignore

@@ -1,2 +1,4 @@
 node_modules/
-scripts/
+scripts/
+contracts/validators/stx-validator/submodules/p256/P256Verifier.sol
+contracts/validators/stx-validator/ERC7739Validator.sol

contracts/validators/stx-validator/ConfigManager.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.27;
 
 import { EnumerableSet } from "EnumerableSet4337/EnumerableSet4337.sol";
 import { FlatBytesLib } from "flatbytes/BytesLib.sol";
-import { IStatelessValidator } from "contracts/interfaces/standard/erc-7780/IStatelessValidator.sol";
 import {
     SIG_TYPE_MEE_FLOW,
     SIG_TYPE_SIMPLE,
@@ -89,6 +88,7 @@ contract ConfigManager {
      * @param smartAccount The smart account that requested the validation
      * @param sigData The signature data to get the submodules for
      */
+    // solhint-disable code-complexity
     function _getSubmodules(
         address smartAccount,
         bytes calldata sigData
@@ -149,6 +149,8 @@ contract ConfigManager {
         }
     }
 
+    // solhint-enable code-complexity
+
     /**
      * @dev Internal function to get the ownership data for the given stateless validator address
      * @param smartAccount The smart account that requested the validation

contracts/validators/stx-validator/StxValidator.sol

@@ -461,7 +461,6 @@ contract StxValidator is IValidator, IStatelessValidator, ERC7739Validator, IERC
      */
 
     function deleteConfig(bytes32 configId) external {
-        address statelessValidatorAddress = customConfigs[configId][msg.sender].statelessValidatorAddress;
         _deleteConfigForAccount(msg.sender, configId);
         emit ConfigDeleted(configId, msg.sender);
     }
@@ -625,7 +624,6 @@ contract StxValidator is IValidator, IStatelessValidator, ERC7739Validator, IERC
         override
         returns (bool isValidSig)
     {
-        address stxModeVerifierAddress = address(bytes20(signature[0:20]));
         address statelessValidatorAddress = address(bytes20(signature[20:40]));
         bytes memory _ownershipData = _getOwnershipData(account, statelessValidatorAddress);
         isValidSig = _validateSignatureViaErc7780(statelessValidatorAddress, _ownershipData, hash, signature[40:]);

contracts/validators/stx-validator/submodules/EOAStatelessValidator.sol

@@ -67,7 +67,13 @@ contract EOAStatelessValidator is IStatelessValidator {
         // do nothing
     }
 
-    function isInitialized(address smartAccount) external view returns (bool) {
+    function isInitialized(
+        address /* smartAccount */
+    )
+        external
+        view
+        returns (bool)
+    {
         // stateless validator is always initialized
         return true;
     }

contracts/validators/stx-validator/submodules/NoStxModeVerifier.sol

@@ -1,14 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.27;
 
-import { MerkleProofLib } from "solady/utils/MerkleProofLib.sol";
-import { EcdsaHelperLib } from "../../../lib/util/EcdsaHelperLib.sol";
-import { MeeUserOpHashLib } from "../../../lib/stx-validator/MeeUserOpHashLib.sol";
-import { ERC20 } from "solady/tokens/ERC20.sol";
 import { IStxModeVerifier } from "contracts/interfaces/stx-validator/IStxModeVerifier.sol";
-import { EfficientHashLib } from "solady/utils/EfficientHashLib.sol";
 import { IERC7739Multiplexer } from "contracts/interfaces/stx-validator/IERC7739Multiplexer.sol";
-import { HashLib } from "contracts/lib/stx-validator/HashLib.sol";
 
 /**
  * @dev Fallback submodule for the no stx mode.

contracts/validators/stx-validator/submodules/PermitSubmodule.sol

@@ -7,7 +7,6 @@ import { MeeUserOpHashLib } from "../../../lib/stx-validator/MeeUserOpHashLib.so
 import { ERC20 } from "solady/tokens/ERC20.sol";
 import { IStxModeVerifier } from "contracts/interfaces/stx-validator/IStxModeVerifier.sol";
 import { EfficientHashLib } from "solady/utils/EfficientHashLib.sol";
-import { IERC7739Multiplexer } from "contracts/interfaces/stx-validator/IERC7739Multiplexer.sol";
 import { HashLib } from "contracts/lib/stx-validator/HashLib.sol";
 
 /**

contracts/validators/stx-validator/submodules/p256/P256StatelessValidator.sol

@@ -22,7 +22,7 @@ contract P256StatelessValidator is IStatelessValidator, P256Verifier {
     ///      See https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md.
     address private constant _VERIFIER = address(0x100);
 
-    uint256 constant P256_N_DIV_2 =
+    uint256 internal constant P256_N_DIV_2 =
         57_896_044_605_178_124_381_348_723_474_703_786_764_998_477_612_067_880_171_211_129_530_534_256_022_184;
 
     error InvalidP256SignatureLength();
@@ -93,7 +93,13 @@ contract P256StatelessValidator is IStatelessValidator, P256Verifier {
         // do nothing
     }
 
-    function isInitialized(address smartAccount) external view returns (bool) {
+    function isInitialized(
+        address /* smartAccount */
+    )
+        external
+        view
+        returns (bool)
+    {
         // stateless validator is always initialized
         return true;
     }