pruned some codes to reduce code size

Author: leekt

src/Kernel.sol

@@ -110,10 +110,10 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
         bytes[] calldata initConfig
     ) external {
         ValidationStorage storage vs = _validationStorage();
-        require(
-            ValidationId.unwrap(vs.rootValidator) == bytes21(0) && bytes2(address(this).code) != EIP7702_PREFIX,
-            AlreadyInitialized()
-        );
+        if(
+            ValidationId.unwrap(vs.rootValidator) != bytes21(0) || bytes2(address(this).code) == EIP7702_PREFIX) {
+            revert AlreadyInitialized();
+        }
         if (ValidationId.unwrap(_rootValidator) == bytes21(0)) {
             revert InvalidValidator();
         }
@@ -140,7 +140,7 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
         bytes calldata hookData
     ) external payable onlyEntryPointOrSelfOrRoot {
         ValidationStorage storage vs = _validationStorage();
-        if (ValidationId.unwrap(_rootValidator) == bytes21(0) || bytes2(address(this).code) == EIP7702_PREFIX) {
+        if (ValidationId.unwrap(_rootValidator) == bytes21(0)) {
             revert InvalidValidator();
         }
         ValidationType vType = ValidatorLib.getType(_rootValidator);
@@ -444,7 +444,9 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
             if (target == address(0)) {
                 return;
             }
-            require(target == module, InvalidSelector());
+            if (target != module) {
+                revert InvalidSelector();
+            }
             deInitData = deInitData[4:];
         } else if (moduleType == MODULE_TYPE_HOOK) {
             ValidationId vId = _validationStorage().rootValidator;

src/core/ValidationManager.sol

@@ -69,6 +69,7 @@ abstract contract ValidationManager is EIP712, SelectorManager, HookManager, Exe
     error InvalidMode();
     error InvalidValidator();
     error InvalidSignature();
+    error InvalidSelectorData();
     error EnableNotApproved();
     error PolicySignatureOrderError();
     error SignerPrefixNotPresent();
@@ -334,7 +335,7 @@ abstract contract ValidationManager is EIP712, SelectorManager, HookManager, Exe
                     )
                 );
             } else if (vType == VALIDATION_TYPE_7702) {
-                validationData = _verify7702Signature(userOpHash, userOpSig) == ERC1271_MAGICVALUE
+                validationData = _verify7702Signature(ECDSA.toEthSignedMessageHash(userOpHash), userOpSig) == ERC1271_MAGICVALUE
                     ? ValidationData.wrap(0)
                     : ValidationData.wrap(1);
             } else {
@@ -491,8 +492,10 @@ abstract contract ValidationManager is EIP712, SelectorManager, HookManager, Exe
     ) internal view returns (ValidationConfig memory config, bytes32 digest) {
         ValidationStorage storage state = _validationStorage();
         config.hook = IHook(hook);
-        config.nonce =
-            state.validationConfig[vId].nonce == state.currentNonce ? state.currentNonce + 1 : state.currentNonce;
+        unchecked {
+            config.nonce =
+                state.validationConfig[vId].nonce == state.currentNonce ? state.currentNonce + 1 : state.currentNonce;
+        }
 
         bytes32 structHash = keccak256(
             abi.encode(
@@ -536,7 +539,9 @@ abstract contract ValidationManager is EIP712, SelectorManager, HookManager, Exe
             _installHook(IHook(address(bytes20(selectorData[24:44]))), data.hookInitData);
         } else {
             // set without install
-            require(selectorData.length == 4, "Invalid selectorData");
+            if (selectorData.length != 4) {
+                revert InvalidSelectorData();
+            }
         }
     }
 

src/utils/ExecLib.sol

@@ -69,20 +69,24 @@ library ExecLib {
     function execute(bytes32[] calldata pointers) internal returns (bytes[] memory result) {
         uint256 length = pointers.length;
         result = new bytes[](length);
-        for (uint256 i; i < length; i++) {
-            (address target, uint256 value, bytes calldata data) = LibERC7579.getExecution(pointers, i);
-            result[i] = execute(target, value, data);
+        unchecked {
+            for (uint256 i; i < length; i++) {
+                (address target, uint256 value, bytes calldata data) = LibERC7579.getExecution(pointers, i);
+                result[i] = execute(target, value, data);
+            }
         }
     }
 
     function tryExecute(bytes32[] calldata pointers) internal returns (bytes[] memory result) {
         uint256 length = pointers.length;
         result = new bytes[](length);
-        for (uint256 i; i < length; i++) {
-            (address target, uint256 value, bytes calldata data) = LibERC7579.getExecution(pointers, i);
-            bool success;
-            (success, result[i]) = tryExecute(target, value, data);
-            if (!success) emit TryExecuteUnsuccessful(i, result[i]);
+        unchecked {
+            for (uint256 i; i < length; i++) {
+                (address target, uint256 value, bytes calldata data) = LibERC7579.getExecution(pointers, i);
+                bool success;
+                (success, result[i]) = tryExecute(target, value, data);
+                if (!success) emit TryExecuteUnsuccessful(i, result[i]);
+            }
         }
     }
 

test/base/Kernel7702TestBase.sol

@@ -426,7 +426,7 @@ contract Kernel7702TestBase is TestPlus, Test {
         virtual
         returns (bytes memory)
     {
-        return _rootSignDigest(userOpHash, success);
+        return _rootSignDigest(ECDSA.toEthSignedMessageHash(userOpHash), success);
     }
 
     function _validatorSignUserOp(PackedUserOperation memory, bytes32 userOpHash, bool success)