feat: make storage 4337 compliant

rhinestonewtf · kopy-kat · Jul 8, 2024 · Jun 27, 2024 · Jun 27, 2024 · Jun 27, 2024
commit a8d25f7fe07e04af02738f806c78bd21f134dc01
diff --git a/src/core/Initializer.sol b/src/core/Initializer.sol
@@ -3,12 +3,12 @@

 import { ISafe7579 } from "../ISafe7579.sol";
 import { ISafe } from "../interfaces/ISafe.sol";
 import "../DataTypes.sol";
 import { ModuleInstallUtil } from "../utils/DCUtil.sol";
 import { ModuleManager } from "./ModuleManager.sol";

 import {
    IValidator,
    MODULE_TYPE_VALIDATOR,
    MODULE_TYPE_HOOK,
    MODULE_TYPE_EXECUTOR,
@@ -106,9 +106,8 @@
             revert InvalidInitData(msg.sender);
         }
 
-        SentinelListLib.SentinelList storage $executors = $executorStorage[msg.sender];
         // this will revert if already initialized.
-        $executors.init();
+        $executors.init({ account: msg.sender });
 
         length = executors.length;
         for (uint256 i; i < length; i++) {

diff --git a/src/core/ModuleManager.sol b/src/core/ModuleManager.sol
@@ -6,7 +6,7 @@
 import { IModule, IHook } from "../interfaces/IERC7579Module.sol";
 import { ISafe } from "../interfaces/ISafe.sol";
 import { ISafe7579 } from "../ISafe7579.sol";
 import "../DataTypes.sol";

 import { RegistryAdapter } from "./RegistryAdapter.sol";
 import { Receiver } from "erc7579/core/Receiver.sol";
@@ -116,8 +116,8 @@
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      EXECUTOR MODULES                      */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-    mapping(address smartAccount => SentinelListLib.SentinelList _executors) internal
-        $executorStorage;
+
+    SentinelList4337Lib.SentinelList internal $executors;
 
     modifier onlyExecutorModule() {
         if (!_isExecutorInstalled(_msgSender())) revert InvalidModule(_msgSender());
@@ -138,8 +138,7 @@
         withRegistry(executor, MODULE_TYPE_EXECUTOR)
         returns (bytes memory moduleInitData)
     {
-        SentinelListLib.SentinelList storage $executors = $executorStorage[msg.sender];
-        $executors.push(executor);
+        $executors.push({ account: msg.sender, newEntry: executor });
         return data;
     }
 
@@ -156,38 +155,44 @@
         internal
         returns (bytes memory moduleDeInitData)
     {
-        SentinelListLib.SentinelList storage $executors = $executorStorage[msg.sender];
         address prev;
         (prev, moduleDeInitData) = abi.decode(data, (address, bytes));
-        $executors.pop(prev, executor);
+        $executors.pop({ account: msg.sender, prevEntry: prev, popEntry: executor });
     }
 
-    function _isExecutorInstalled(address executor) internal view virtual returns (bool) {
-        SentinelListLib.SentinelList storage $executors = $executorStorage[msg.sender];
-        return $executors.contains(executor);
+    function _isExecutorInstalled(address executor)
+        internal
+        view
+        virtual
+        returns (bool isInstalled)
+    {
+        isInstalled = $executors.contains({ account: msg.sender, entry: executor });
     }
 
     /**
      * Get paginated list of installed executors
      */
     function getExecutorsPaginated(
         address cursor,
-        uint256 size
+        uint256 pageSize
     )
         external
         view
         virtual
         returns (address[] memory array, address next)
     {
-        SentinelListLib.SentinelList storage $executors = $executorStorage[msg.sender];
-        return $executors.getEntriesPaginated(cursor, size);
+        return $executors.getEntriesPaginated({
+            account: msg.sender,
+            start: cursor,
+            pageSize: pageSize
+        });
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      FALLBACK MODULES                      */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    mapping(address smartAccount => mapping(bytes4 selector => FallbackHandler handlerConfig))
+    mapping(bytes4 selector => mapping(address smartAccount => FallbackHandler handlerConfig))
         internal $fallbackStorage;
 
     function _installFallbackHandler(
@@ -215,15 +220,15 @@
 
         if (_isFallbackHandlerInstalled(functionSig)) revert FallbackInstalled(functionSig);
 
-        FallbackHandler storage $fallbacks = $fallbackStorage[msg.sender][functionSig];
+        FallbackHandler storage $fallbacks = $fallbackStorage[functionSig][msg.sender];
         $fallbacks.calltype = calltype;
         $fallbacks.handler = handler;
 
         return initData;
     }
 
     function _isFallbackHandlerInstalled(bytes4 functionSig) internal view virtual returns (bool) {
-        FallbackHandler storage $fallbacks = $fallbackStorage[msg.sender][functionSig];
+        FallbackHandler storage $fallbacks = $fallbackStorage[functionSig][msg.sender];
         return $fallbacks.handler != address(0);
     }
 
@@ -238,7 +243,7 @@
         bytes4 functionSig;
         (functionSig, moduleDeInitData) = abi.decode(context, (bytes4, bytes));
 
-        FallbackHandler storage $fallbacks = $fallbackStorage[msg.sender][functionSig];
+        FallbackHandler storage $fallbacks = $fallbackStorage[functionSig][msg.sender];
         delete $fallbacks.handler;
     }
 
@@ -253,7 +258,7 @@
     {
         bytes4 functionSig = abi.decode(additionalContext, (bytes4));
 
-        FallbackHandler storage $fallbacks = $fallbackStorage[msg.sender][functionSig];
+        FallbackHandler storage $fallbacks = $fallbackStorage[functionSig][msg.sender];
         return $fallbacks.handler == _handler;
     }
 
@@ -284,7 +289,7 @@
         returns (bytes memory fallbackRet)
     {
         // get handler for specific function selector
-        FallbackHandler storage $fallbacks = $fallbackStorage[msg.sender][msg.sig];
+        FallbackHandler storage $fallbacks = $fallbackStorage[msg.sig][msg.sender];
         address handler = $fallbacks.handler;
         CallType calltype = $fallbacks.calltype;
         // if no handler is set for the msg.sig, revert
@@ -315,7 +320,7 @@
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     mapping(address smartAccount => address globalHook) internal $globalHook;
-    mapping(address smartAccount => mapping(bytes4 => address hook)) internal $hookManager;
+    mapping(bytes4 selector => mapping(address smartAccount => address hook)) internal $hookManager;
 
     /**
      * Run precheck hook for global and function selector specific
@@ -381,15 +386,15 @@
      */
     modifier withHook(bytes4 selector) {
         address globalHook = $globalHook[msg.sender];
-        address sigHook = $hookManager[msg.sender][selector];
+        address sigHook = $hookManager[selector][msg.sender];
         (bytes memory global, bytes memory sig) = _preHooks(globalHook, sigHook);
         _;
         _postHooks(globalHook, sigHook, global, sig);
     }
 
     modifier tryWithHook(address module, bytes4 selector) {
         address globalHook = $globalHook[msg.sender];
-        address sigHook = $hookManager[msg.sender][selector];
+        address sigHook = $hookManager[selector][msg.sender];
 
         if (module != globalHook && module != sigHook) {
             (bytes memory global, bytes memory sig) = _preHooks(globalHook, sigHook);
@@ -429,13 +434,13 @@
             }
             $globalHook[msg.sender] = hook;
         } else if (hookType == HookType.SIG) {
-            currentHook = $hookManager[msg.sender][selector];
+            currentHook = $hookManager[selector][msg.sender];
             // Dont allow hooks to be overwritten. If a hook is currently installed, it must be
             // uninstalled first
             if (currentHook != address(0)) {
                 revert HookAlreadyInstalled(currentHook);
             }
-            $hookManager[msg.sender][selector] = hook;
+            $hookManager[selector][msg.sender] = hook;
         } else {
             revert InvalidHookType();
         }
@@ -457,7 +462,7 @@
         if (hookType == HookType.GLOBAL && selector == 0x0) {
             delete $globalHook[msg.sender];
         } else if (hookType == HookType.SIG) {
-            delete $hookManager[msg.sender][selector];
+            delete $hookManager[selector][msg.sender];
         } else {
             revert InvalidHookType();
         }
@@ -476,7 +481,7 @@
             hook = $globalHook[msg.sender];
         }
         if (hookType == HookType.SIG) {
-            hook = $hookManager[msg.sender][selector];
+            hook = $hookManager[selector][msg.sender];
         }
     }
 
@@ -494,7 +499,7 @@
     }
 
     function getActiveHook(bytes4 selector) public view returns (address hook) {
-        return $hookManager[msg.sender][selector];
+        return $hookManager[selector][msg.sender];
     }
 
     function getActiveHook() public view returns (address hook) {