Fix renaming

zkemail · Sep 12, 2024 · dc78af3 · dc78af3
1 parent c58db22
commit dc78af3
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zk-email/email-recovery",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Smart account module and related contracts to enable email recovery for validators",
   "license": "MIT",
   "author": {

diff --git a/remappings.txt b/remappings.txt
@@ -18,7 +18,7 @@ solady/=node_modules/solady/src/
 solarray/=node_modules/solarray/src/
 @prb/math/=node_modules/@prb/math/src/
 
-ether-email-auth/=node_modules/@zk-email/ether-email-auth-contracts/
+ether-email-auth-contracts/=node_modules/@zk-email/ether-email-auth-contracts/
 @zk-email/contracts/=node_modules/@zk-email/contracts/
 solidity-stringutils/=node_modules/solidity-stringutils/
 @matterlabs/zksync-contracts/l2/contracts/=src/libraries/

diff --git a/script/Deploy7579TestAccount.s.sol b/script/Deploy7579TestAccount.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.25;
 
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
-import { EmailAccountRecovery } from "ether-email-auth/src/EmailAccountRecovery.sol";
+import { EmailAccountRecovery } from "ether-email-auth-contracts/src/EmailAccountRecovery.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
 import { RhinestoneModuleKit } from "modulekit/ModuleKit.sol";
 import { OwnableValidator } from "src/test/OwnableValidator.sol";

diff --git a/script/DeployEmailRecoveryModule.s.sol b/script/DeployEmailRecoveryModule.s.sol
@@ -4,10 +4,11 @@ pragma solidity ^0.8.25;
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
 import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
-import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth-contracts/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
 import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

diff --git a/script/DeploySafeNativeRecovery.s.sol b/script/DeploySafeNativeRecovery.s.sol
@@ -3,10 +3,11 @@ pragma solidity ^0.8.25;
 
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
-import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth-contracts/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { SafeRecoveryCommandHandler } from "src/handlers/SafeRecoveryCommandHandler.sol";
 import { SafeEmailRecoveryModule } from "src/modules/SafeEmailRecoveryModule.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

diff --git a/script/DeploySafeRecovery.s.sol b/script/DeploySafeRecovery.s.sol
@@ -6,10 +6,11 @@ import { console } from "forge-std/console.sol";
 import { SafeRecoveryCommandHandler } from "src/handlers/SafeRecoveryCommandHandler.sol";
 import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
 import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
-import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth-contracts/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
 
 import { Safe7579 } from "safe7579/Safe7579.sol";
 import { Safe7579Launchpad } from "safe7579/Safe7579Launchpad.sol";

diff --git a/script/DeployUniversalEmailRecoveryModule.s.sol b/script/DeployUniversalEmailRecoveryModule.s.sol
@@ -4,10 +4,11 @@ pragma solidity ^0.8.25;
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
 import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
-import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth-contracts/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 

diff --git a/src/EmailRecoveryManager.sol b/src/EmailRecoveryManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.25;
 
-import { EmailAccountRecovery } from "ether-email-auth/src/EmailAccountRecovery.sol";
+import { EmailAccountRecovery } from "ether-email-auth-contracts/src/EmailAccountRecovery.sol";
 import { IEmailRecoveryManager } from "./interfaces/IEmailRecoveryManager.sol";
 import { IEmailRecoveryCommandHandler } from "./interfaces/IEmailRecoveryCommandHandler.sol";
 import { GuardianManager } from "./GuardianManager.sol";

diff --git a/src/EmailRecoveryManagerZkSync.sol b/src/EmailRecoveryManagerZkSync.sol
@@ -2,8 +2,9 @@
 pragma solidity ^0.8.25;
 
 import { EmailRecoveryManager } from "./EmailRecoveryManager.sol";
-import { EmailAccountRecovery } from "ether-email-auth/src/EmailAccountRecovery.sol";
-import { EmailAccountRecoveryZKSync } from "ether-email-auth/src/EmailAccountRecoveryZKSync.sol";
+import { EmailAccountRecovery } from "ether-email-auth-contracts/src/EmailAccountRecovery.sol";
+import { EmailAccountRecoveryZKSync } from
+    "ether-email-auth-contracts/src/EmailAccountRecoveryZKSync.sol";
 
 /**
  * @title EmailRecoveryManagerZkSync

diff --git a/test/integration/EmailRecoveryManager/EmailRecoveryManager.integration.t.sol b/test/integration/EmailRecoveryManager/EmailRecoveryManager.integration.t.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.25;
 import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
-import { EmailAuthMsg } from "ether-email-auth/src/EmailAuth.sol";
+import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
 
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";

diff --git a/test/integration/IntegrationBase.t.sol b/test/integration/IntegrationBase.t.sol
@@ -5,8 +5,9 @@ import { Test } from "forge-std/Test.sol";
 import { console2 } from "forge-std/console2.sol";
 
 import { RhinestoneModuleKit, AccountInstance } from "modulekit/ModuleKit.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { ECDSA } from "solady/utils/ECDSA.sol";
 
 import { MockGroth16Verifier } from "src/test/MockGroth16Verifier.sol";

diff --git a/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol b/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.25;
 import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
-import { EmailAuthMsg } from "ether-email-auth/src/EmailAuth.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
+import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";

diff --git a/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModuleBase.t.sol b/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModuleBase.t.sol
@@ -5,8 +5,8 @@ import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
+import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
 import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
 import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";

diff --git a/.../OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol b/.../OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.25;
 import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
-import { EmailAuthMsg } from "ether-email-auth/src/EmailAuth.sol";
+import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
 
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";

diff --git a/...ableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModuleBase.t.sol b/...ableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModuleBase.t.sol
@@ -5,8 +5,8 @@ import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
+import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
 import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
 import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
 import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";

diff --git a/test/integration/SafeRecovery/SafeIntegrationBase.t.sol b/test/integration/SafeRecovery/SafeIntegrationBase.t.sol
@@ -5,8 +5,8 @@ import { console2 } from "forge-std/console2.sol";
 
 import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
-import { EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
+import { EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";

diff --git a/test/integration/SafeRecovery/SafeNativeIntegrationBase.t.sol b/test/integration/SafeRecovery/SafeNativeIntegrationBase.t.sol
@@ -5,8 +5,8 @@ import { console2 } from "forge-std/console2.sol";
 
 import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
-import { EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
+import { EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";

diff --git a/test/integration/SafeRecovery/SafeRecoveryNativeModule.t.sol b/test/integration/SafeRecovery/SafeRecoveryNativeModule.t.sol
@@ -8,7 +8,7 @@ import { IERC7579Account } from "erc7579/interfaces/IERC7579Account.sol";
 import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";
 import { SafeProxy } from "@safe-global/safe-contracts/contracts/proxies/SafeProxy.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { EmailAuthMsg } from "ether-email-auth/src/EmailAuth.sol";
+import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { SafeEmailRecoveryModule } from "src/modules/SafeEmailRecoveryModule.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { AccountHidingRecoveryCommandHandler } from

diff --git a/test/unit/SafeUnitBase.t.sol b/test/unit/SafeUnitBase.t.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.25;
 import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
-import { EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
+import { EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";

diff --git a/test/unit/UnitBase.t.sol b/test/unit/UnitBase.t.sol
@@ -10,9 +10,10 @@ import {
     ModuleKitUserOp
 } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
-import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
+import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { ECDSA } from "solady/utils/ECDSA.sol";
 

diff --git a/test/unit/modules/EmailRecoveryModule/EmailRecoveryModuleBase.t.sol b/test/unit/modules/EmailRecoveryModule/EmailRecoveryModuleBase.t.sol
@@ -10,9 +10,10 @@ import {
     ModuleKitUserOp
 } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
-import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { CommandUtils } from "ether-email-auth/src/libraries/CommandUtils.sol";
-import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth/src/EmailAuth.sol";
+import { ECDSAOwnedDKIMRegistry } from
+    "ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
+import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { ECDSA } from "solady/utils/ECDSA.sol";