refactor

bcnmy · Feb 3, 2025 · 1e4eab1 · 1e4eab1
1 parent 76b5ab4
commit 1e4eab1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/contracts/Nexus.sol b/contracts/Nexus.sol
@@ -123,7 +123,7 @@ contract Nexus is INexus, BaseAccount, ExecutionHelper, ModuleManager, UUPSUpgra
                 validationData = IValidator(validator).validateUserOp(userOp, userOpHash);
             } else {
                 // If the account is not initialized, check the signature against the account
-                if (!_isAlreadyInitialized()) {
+                if (!_hasValidators() && !_hasExecutors()) {
                     // Check the userOp signature if the validator is not installed (used for EIP7702)
                     validationData = _checkSelfSignature(op.signature, userOpHash) ? VALIDATION_SUCCESS : VALIDATION_FAILED;
                 } else {

diff --git a/contracts/base/ModuleManager.sol b/contracts/base/ModuleManager.sol
@@ -467,7 +467,7 @@ abstract contract ModuleManager is Storage, EIP712, IModuleManagerEventsAndError
             }
         } else {
             // If the account is not initialized, check the signature against the account
-            if (!_isAlreadyInitialized()) {
+            if (!_hasValidators() && !_hasExecutors()) {
                 // ERC-7739 is not required here as the userOpHash is hashed into the structHash => safe
                 return _checkSelfSignature(sig, eip712Digest);
             } else {