working tests and dev notes

bcnmy · Jun 11, 2024 · ee9c6a9 · ee9c6a9
1 parent feca707
commit ee9c6a9
Show file tree

Hide file tree

Showing 2 changed files with 692 additions and 6 deletions.
diff --git a/contracts/smart-account/modules/SessionKeyManagers/DANSessionKeyManagerModule.sol b/contracts/smart-account/modules/SessionKeyManagers/DANSessionKeyManagerModule.sol
@@ -59,7 +59,7 @@ contract DANSessionKeyManager is
             uint48 validUntil,
             uint48 validAfter,
             address sessionValidationModule,
-            bytes memory sessionKeyData,
+            bytes memory sessionKeyData, // This could just be a session key address
             bytes32[] memory merkleProof,
             bytes memory sessionKeySignature
         ) = abi.decode(
@@ -76,15 +76,18 @@ contract DANSessionKeyManager is
             merkleProof
         );
 
-        (address sessionKey, , , , ) = abi.decode(
-            sessionKeyData,
-            (address, address, address, uint256, uint256)
-        );
+        bytes20 sessionKeyAddressBytes;
+
+        assembly {
+            sessionKeyAddressBytes := mload(add(sessionKeyData, 0x20))
+        }
+
+        address sessionKeyEOA = address(uint160(sessionKeyAddressBytes));
 
         bool isValidSignatureFromDAN = ECDSA.recover(
             ECDSA.toEthSignedMessageHash(userOpHash),
             sessionKeySignature
-        ) == sessionKey;
+        ) == sessionKeyEOA;
 
         return
             _packValidationData(