fix: revert if validator is installed and non-zero

rhinestonewtf · Dec 6, 2024 · aecb25e · aecb25e
1 parent 82f7348
commit aecb25e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/test/helpers/SafeHelpers.sol b/src/test/helpers/SafeHelpers.sol
@@ -330,7 +330,7 @@ contract SafeHelpers is HelperBase {
     /// @return bytes32 the formatted hash
     function formatERC1271Hash(
         AccountInstance memory instance,
-        address,
+        address validator,
         bytes32 hash
     )
         public
@@ -339,6 +339,13 @@ contract SafeHelpers is HelperBase {
         deployAccountForAction(instance)
         returns (bytes32)
     {
+        // Revert if validator is not 0x0 or the validator is installed
+        if (
+            validator != address(0x0)
+                && isModuleInstalled(instance, MODULE_TYPE_VALIDATOR, validator, "")
+        ) {
+            revert("formatERC1271Hash: validator is installed");
+        }
         bytes memory messageData = abi.encodePacked(
             bytes1(0x19),
             bytes1(0x01),