fix: [ALCHEMY-010] easy fixes (002, 015, 016)

alchemyplatform · Nov 22, 2024 · f0f63f8 · f0f63f8
1 parent ed5c3e8
commit f0f63f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/gas-snapshots/ModularAccount.json b/gas-snapshots/ModularAccount.json
@@ -1,5 +1,5 @@
 {
-  "Runtime_AccountCreation": "176147",
+  "Runtime_AccountCreation": "176129",
   "Runtime_BatchTransfers": "93045",
   "Runtime_Erc20Transfer": "78454",
   "Runtime_InstallSessionKey_Case1": "423148",

diff --git a/src/account/AccountStorage.sol b/src/account/AccountStorage.sol
@@ -50,7 +50,7 @@ struct ValidationStorage {
 /// @custom:storage-location erc7201:Alchemy.ModularAccount.Storage_V2
 struct AccountStorage {
     // AccountStorageInitializable variables.
-    uint8 initialized;
+    uint64 initialized;
     bool initializing;
     // Execution functions and their associated functions.
     mapping(bytes4 selector => ExecutionStorage) executionStorage;

diff --git a/src/helpers/ExecutionInstallDelegate.sol b/src/helpers/ExecutionInstallDelegate.sol
@@ -94,6 +94,10 @@ contract ExecutionInstallDelegate {
     {
         AccountStorage storage _storage = getAccountStorage();
 
+        if (module == address(0)) {
+            revert NullModule();
+        }
+
         uint256 length = manifest.executionHooks.length;
         for (uint256 i = 0; i < length; ++i) {
             ManifestExecutionHook memory mh = manifest.executionHooks[i];
@@ -132,7 +136,7 @@ contract ExecutionInstallDelegate {
         bool allowGlobalValidation,
         address module
     ) internal {
-        ExecutionStorage storage _executionStorage = getAccountStorage().executionStorage[bytes4(selector)];
+        ExecutionStorage storage _executionStorage = getAccountStorage().executionStorage[selector];
 
         if (_executionStorage.module != address(0)) {
             revert ExecutionFunctionAlreadySet();