Pass isInstalledContext to onInstall

zkemail · Jun 20, 2024 · aee7b4e · aee7b4e
1 parent 50a2b77
commit aee7b4e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/src/modules/EmailRecoveryModule.sol b/src/modules/EmailRecoveryModule.sol
@@ -66,16 +66,18 @@ contract EmailRecoveryModule is ERC7579ExecutorBase, IRecoveryModule {
         if (data.length == 0) revert InvalidOnInstallData();
         (
             address validator,
+            bytes memory isInstalledContext,
             bytes4 initialSelector,
             address[] memory guardians,
             uint256[] memory weights,
             uint256 threshold,
             uint256 delay,
             uint256 expiry
-        ) = abi.decode(data, (address, bytes4, address[], uint256[], uint256, uint256, uint256));
+        ) = abi.decode(
+            data, (address, bytes, bytes4, address[], uint256[], uint256, uint256, uint256)
+        );
 
-        // TODO: Should isInstalledContext be passed in?
-        allowValidatorRecovery(validator, bytes("0"), initialSelector);
+        allowValidatorRecovery(validator, isInstalledContext, initialSelector);
 
         _execute({
             to: emailRecoveryManager,

diff --git a/test/integration/OwnableValidatorRecovery/OwnableValidatorRecoveryBase.t.sol b/test/integration/OwnableValidatorRecovery/OwnableValidatorRecoveryBase.t.sol
@@ -28,6 +28,7 @@ abstract contract OwnableValidatorRecoveryBase is IntegrationBase {
     address validatorAddress;
 
     OwnableValidator validator;
+    bytes isInstalledContext;
     bytes4 functionSelector;
     bytes recoveryCalldata;
     bytes32 calldataHash;
@@ -51,6 +52,7 @@ abstract contract OwnableValidatorRecoveryBase is IntegrationBase {
         // Deploy validator to be recovered
         validator = new OwnableValidator();
         validatorAddress = address(validator);
+        isInstalledContext = bytes("0");
         functionSelector = bytes4(keccak256(bytes("changeOwner(address,address,address)")));
         recoveryCalldata = abi.encodeWithSignature(
             "changeOwner(address,address,address)", accountAddress, recoveryModuleAddress, newOwner
@@ -77,7 +79,14 @@ abstract contract OwnableValidatorRecoveryBase is IntegrationBase {
             moduleTypeId: MODULE_TYPE_EXECUTOR,
             module: recoveryModuleAddress,
             data: abi.encode(
-                validatorAddress, functionSelector, guardians, guardianWeights, threshold, delay, expiry
+                validatorAddress,
+                isInstalledContext,
+                functionSelector,
+                guardians,
+                guardianWeights,
+                threshold,
+                delay,
+                expiry
             )
         });
     }

diff --git a/test/integration/SafeRecovery/SafeRecovery.t.sol b/test/integration/SafeRecovery/SafeRecovery.t.sol
@@ -33,6 +33,7 @@ contract SafeRecovery_Integration_Test is SafeIntegrationBase {
     //         module: recoveryModuleAddress,
     //         data: abi.encode(
     //             address(safe), // FIXME: requires rhinestone change
+    //             isInstalledContext,
     //             functionSelector,
     //             guardians,
     //             guardianWeights,

diff --git a/test/unit/EmailRecoveryManager/configureRecovery.t.sol b/test/unit/EmailRecoveryManager/configureRecovery.t.sol
@@ -55,6 +55,7 @@ contract EmailRecoveryManager_configureRecovery_Test is UnitBase {
             module: recoveryModuleAddress,
             data: abi.encode(
                 validatorAddress,
+                isInstalledContext,
                 functionSelector,
                 guardians,
                 guardianWeights,

diff --git a/test/unit/UnitBase.t.sol b/test/unit/UnitBase.t.sol
@@ -51,6 +51,7 @@ abstract contract UnitBase is RhinestoneModuleKit, Test {
     address validatorAddress;
 
     OwnableValidator validator;
+    bytes isInstalledContext;
     bytes4 functionSelector;
     bytes recoveryCalldata;
     bytes32 calldataHash;
@@ -155,6 +156,7 @@ abstract contract UnitBase is RhinestoneModuleKit, Test {
         // Deploy validator to be recovered
         validator = new OwnableValidator();
         validatorAddress = address(validator);
+        isInstalledContext = bytes("0");
         functionSelector = bytes4(keccak256(bytes("changeOwner(address,address,address)")));
         recoveryCalldata = abi.encodeWithSignature(
             "changeOwner(address,address,address)", accountAddress, recoveryModuleAddress, newOwner
@@ -171,7 +173,14 @@ abstract contract UnitBase is RhinestoneModuleKit, Test {
             moduleTypeId: MODULE_TYPE_EXECUTOR,
             module: recoveryModuleAddress,
             data: abi.encode(
-                validatorAddress, functionSelector, guardians, guardianWeights, threshold, delay, expiry
+                validatorAddress,
+                isInstalledContext,
+                functionSelector,
+                guardians,
+                guardianWeights,
+                threshold,
+                delay,
+                expiry
             )
         });
     }

diff --git a/test/unit/modules/EmailRecoveryModule/onInstall.t.sol b/test/unit/modules/EmailRecoveryModule/onInstall.t.sol
@@ -39,7 +39,14 @@ contract EmailRecoveryModule_onInstall_Test is UnitBase {
             moduleTypeId: MODULE_TYPE_EXECUTOR,
             module: recoveryModuleAddress,
             data: abi.encode(
-                validatorAddress, functionSelector, guardians, guardianWeights, threshold, delay, expiry
+                validatorAddress,
+                isInstalledContext,
+                functionSelector,
+                guardians,
+                guardianWeights,
+                threshold,
+                delay,
+                expiry
             )
         });