fix : do propor posthook routing if hook is 0xff and check testcase w…

…orks properly
zerodevapp · May 7, 2024 · 30d32f6 · 30d32f6
1 parent 6667ec5
commit 30d32f6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/Kernel.sol b/src/Kernel.sol
@@ -170,7 +170,9 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
             } else {
                 revert NotSupportedCallType();
             }
-            if (address(config.hook) != address(1)) {
+            if (
+                address(config.hook) != address(1) && address(config.hook) != 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF
+            ) {
                 _doPostHook(config.hook, context);
             }
         }

diff --git a/src/sdk/KernelTestBase.sol b/src/sdk/KernelTestBase.sol
@@ -705,6 +705,8 @@ abstract contract KernelTestBase is Test {
             );
             PackedUserOperation[] memory ops = new PackedUserOperation[](1);
             ops[0] = op;
+            vm.expectEmit(address(kernel));
+            emit MockAction.MockActionEvent(address(kernel));
             entrypoint.handleOps(ops, payable(address(0xdeadbeef)));
         }
 

diff --git a/src/validator/ECDSAValidator.sol b/src/validator/ECDSAValidator.sol
@@ -24,7 +24,6 @@ contract ECDSAValidator is IValidator, IHook {
     mapping(address => ECDSAValidatorStorage) public ecdsaValidatorStorage;
 
     function onInstall(bytes calldata _data) external payable override {
-        if (_isInitialized(msg.sender)) revert AlreadyInitialized(msg.sender);
         address owner = address(bytes20(_data[0:20]));
         ecdsaValidatorStorage[msg.sender].owner = owner;
         emit OwnerRegistered(msg.sender, owner);

diff --git a/src/validator/MultiSignatureECDSAValidator.sol b/src/validator/MultiSignatureECDSAValidator.sol
@@ -25,7 +25,6 @@ contract MultiSignatureECDSAValidator is IValidator, IHook {
     mapping(address => ECDSAValidatorStorage) public ecdsaValidatorStorage;
 
     function onInstall(bytes calldata _data) external payable override {
-        if (_isInitialized(msg.sender)) revert AlreadyInitialized(msg.sender);
         address owner = address(bytes20(_data[0:20]));
         ecdsaValidatorStorage[msg.sender].owner = owner;
         emit OwnerRegistered(msg.sender, owner);