move self target check to SessionLib.validate

Abstract-Foundation · Dec 13, 2024 · 1947bac · 1947bac
1 parent 9b30462
commit 1947bac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contracts/libraries/SessionLib.sol b/contracts/libraries/SessionLib.sol
@@ -194,6 +194,10 @@ library SessionLib {
     }
 
     if (transaction.data.length >= 4) {
+      // Disallow self-targeting transactions with session keys as these have the ability to administer
+      // the smart account.
+      require(address(uint160(transaction.to)) != msg.sender, "Can not target self");
+
       bytes4 selector = bytes4(transaction.data[:4]);
       CallSpec memory callPolicy;
       bool found = false;

diff --git a/contracts/validators/SessionKeyValidator.sol b/contracts/validators/SessionKeyValidator.sol
@@ -143,10 +143,6 @@ contract SessionKeyValidator is IValidationHook, IModuleValidator, IModule {
     (address recoveredAddress, , ) = ECDSA.tryRecover(signedHash, signature);
     require(recoveredAddress == spec.signer, "Invalid signer");
 
-    // Disallow self-targeting transactions with session keys as these have the ability to administer
-    // the smart account.
-    require(address(uint160(transaction.to)) != msg.sender, "Can not target self");
-
     bytes32 sessionHash = keccak256(abi.encode(spec));
     sessions[sessionHash].validate(transaction, spec, periodIds);