refactored code a bit

zerodevapp · Dec 11, 2024 · 0ff92c6 · 0ff92c6
1 parent b333793
commit 0ff92c6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/src/core/ExecutorManager.sol b/src/core/ExecutorManager.sol
@@ -32,7 +32,7 @@ abstract contract ExecutorManager {
     function _installExecutor(IExecutor executor, bytes calldata executorData, IHook hook) internal {
         _installExecutorWithoutInit(executor, hook);
         if (executorData.length == 0) {
-            (bool success,) = address(executor).call(abi.encodeWithSelector(IModule.onInstall.selector, hex""));
+            (bool success,) = address(executor).call(abi.encodeWithSelector(IModule.onInstall.selector, hex"")); // ignore return value
         } else {
             executor.onInstall(executorData);
         }

diff --git a/src/core/ValidationManager.sol b/src/core/ValidationManager.sol
@@ -21,6 +21,7 @@ import {
 } from "../utils/ValidationTypeLib.sol";
 
 import {CALLTYPE_SINGLE, MODULE_TYPE_POLICY, MODULE_TYPE_SIGNER, MODULE_TYPE_VALIDATOR} from "../types/Constants.sol";
+import {calldataKeccak, getSender} from "../utils/Utils.sol";
 
 import {PermissionId, getValidationResult, CallType} from "../types/Types.sol";
 import {_intersectValidationData} from "../utils/KernelValidationResult.sol";
@@ -605,26 +606,9 @@ abstract contract ValidationManager is EIP712, SelectorManager, HookManager, Exe
         return isReplayable ? _chainAgnosticHashTypedData(structHash) : _hashTypedData(structHash);
     }
 
-    function calldataKeccak(bytes calldata data) internal pure returns (bytes32 ret) {
-        assembly ("memory-safe") {
-            let mem := mload(0x40)
-            let len := data.length
-            calldatacopy(mem, data.offset, len)
-            ret := keccak256(mem, len)
-        }
-    }
-
-    function getSender(PackedUserOperation calldata userOp) internal pure returns (address) {
-        address data;
-        //read sender from userOp, which is first userOp member (saves 800 gas...)
-        assembly {
-            data := calldataload(userOp)
-        }
-        return address(uint160(data));
-    }
-
+    // chain agnostic internal functions
     /// @dev Returns the EIP-712 domain separator.
-    function _buildChainAgnosticDomainSeparator() private view returns (bytes32 separator) {
+    function _buildChainAgnosticDomainSeparator() internal view returns (bytes32 separator) {
         // We will use `separator` to store the name hash to save a bit of gas.
         bytes32 versionHash;
         (string memory name, string memory version) = _domainNameAndVersion();
@@ -642,7 +626,7 @@ abstract contract ValidationManager is EIP712, SelectorManager, HookManager, Exe
         }
     }
 
-    function _chainAgnosticHashTypedData(bytes32 structHash) internal view virtual returns (bytes32 digest) {
+    function _chainAgnosticHashTypedData(bytes32 structHash) internal view returns (bytes32 digest) {
         // we don't do cache stuff here
         digest = _buildChainAgnosticDomainSeparator();
         /// @solidity memory-safe-assembly

diff --git a/src/sdk/KernelTestBase.sol b/src/sdk/KernelTestBase.sol
@@ -211,7 +211,7 @@ abstract contract KernelTestBase is TestPlus, Test {
 
         bytes32 digest;
         if (isReplayable) {
-            digest = _chainAgnosticHashTypedData(address(kernel), "Kernel", "0.3.2", hash);
+            digest = chainAgnosticHashTypedData(address(kernel), "Kernel", "0.3.2", hash);
         } else {
             digest =
                 keccak256(abi.encodePacked("\x19\x01", _buildDomainSeparator("Kernel", "0.3.2", address(kernel)), hash));
@@ -1184,7 +1184,7 @@ abstract contract KernelTestBase is TestPlus, Test {
     }
 
     /// @dev Returns the EIP-712 domain separator.
-    function _buildChainAgnosticDomainSeparator(address addr, string memory name, string memory version)
+    function buildChainAgnosticDomainSeparator(address addr, string memory name, string memory version)
         private
         view
         returns (bytes32 separator)
@@ -1207,14 +1207,14 @@ abstract contract KernelTestBase is TestPlus, Test {
         }
     }
 
-    function _chainAgnosticHashTypedData(address addr, string memory name, string memory version, bytes32 structHash)
+    function chainAgnosticHashTypedData(address addr, string memory name, string memory version, bytes32 structHash)
         internal
         view
         virtual
         returns (bytes32 digest)
     {
         // we don't do cache stuff here
-        digest = _buildChainAgnosticDomainSeparator(addr, name, version);
+        digest = buildChainAgnosticDomainSeparator(addr, name, version);
         /// @solidity memory-safe-assembly
         assembly {
             // Compute the digest.

diff --git a/src/utils/Utils.sol b/src/utils/Utils.sol
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {PackedUserOperation} from "../interfaces/PackedUserOperation.sol";
+
+function calldataKeccak(bytes calldata data) pure returns (bytes32 ret) {
+    assembly ("memory-safe") {
+        let mem := mload(0x40)
+        let len := data.length
+        calldatacopy(mem, data.offset, len)
+        ret := keccak256(mem, len)
+    }
+}
+
+function getSender(PackedUserOperation calldata userOp) pure returns (address) {
+    address data;
+    //read sender from userOp, which is first userOp member (saves 800 gas...)
+    assembly {
+        data := calldataload(userOp)
+    }
+    return address(uint160(data));
+}